Changeset 360

Timestamp:

Jul 31, 2018, 11:03:54 PM (6 years ago)

Author:

coas-nagasima

Message:

#lineのパスに\が入っている場合
に変更するよう変更
*.dファイルに書かれたスペースのあるパスが処理できないのを修正

Location:

EcnlProtoTool/trunk

Files:

• asp3_dcre/cfg/pass1.rb (modified) (2 diffs)
• mruby-1.3.0/tasks/mruby_build_commands.rake (modified) (1 diff)

EcnlProtoTool/trunk/asp3_dcre/cfg/pass1.rb

@@ -727 +727 @@
   #
   def self.OutLineNumber(cfgInfo)
-    @cfg1Out.add("#line #{cfgInfo[:_LINE_]} \"#{cfgInfo[:_FILE_]}\"")
+    @cfg1Out.add("#line #{cfgInfo[:_LINE_]} \"#{cfgInfo[:_FILE_].gsub('\\', '/')}\"")
   end
 
@@ -734 +734 @@
   #
   def self.OutClassLineNumber(cfgInfo)
-    @cfg1Out.add("#line #{cfgInfo[:CLASS_LINE_]} \"#{cfgInfo[:CLASS_FILE_]}\"")
+    @cfg1Out.add("#line #{cfgInfo[:CLASS_LINE_]} \"#{cfgInfo[:CLASS_FILE_].gsub('\\', '/')}\"")
   end
 

EcnlProtoTool/trunk/mruby-1.3.0/tasks/mruby_build_commands.rake

@@ -134 +134 @@
       file = file.ext('d') unless File.extname(file) == '.d'
       if File.exist?(file)
-        File.read(file).gsub("\\\n ", "").scan(/^\S+:\s+(.+)$/).flatten.map {|s| s.split(' ') }.flatten
+        deps = File.read(file).gsub("\\\n ", "").scan(/^\S+:\s+(.+)$/).flatten.map {|s| s.split(/(?<!\\) /) }.flatten
+        deps.collect{ |f| f.gsub(/(\\ )/, " ") }.flatten
       else
         []