Changeset 374 for asp3_tinet_ecnl_arm/trunk/asp3_dcre/tecsgen/tecslib/core/bnf.y.rb

Timestamp:

Apr 5, 2019, 9:26:53 PM (5 years ago)

Author:

coas-nagasima

Message:

mbed関連を更新
シリアルドライバをmbedのHALを使うよう変更
ファイルディスクリプタの処理を更新

File:

• asp3_tinet_ecnl_arm/trunk/asp3_dcre/tecsgen/tecslib/core/bnf.y.rb (modified) (8 diffs)

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tecsgen/tecslib/core/bnf.y.rb

@@ -4 +4 @@
 #      Generator for TOPPERS Embedded Component System
 #  
-#   Copyright (C) 2008-2016 by TOPPERS Project
+#   Copyright (C) 2008-2018 by TOPPERS Project
 #--
 #   上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
@@ -379 +379 @@
                 {
                         # tag が無い場合、内部名を与える
-                        result = StructType.new( :"$TAG_#{@@no_struct_tag_num}" )
+                        result = StructType.new( :"TAG__#{@@no_struct_tag_num}__" )
                         @@no_struct_tag_num += 1
                         StructType.set_define( true )
@@ -800 +800 @@
 
 region_name_list
-        : IDENTIFIER
-                {       result = [val[0].val]           }
-        | region_name_list ',' IDENTIFIER
-                {       result << val[2].val            }
+        : namespace_identifier
+                {       result = [val[0]]               }
+        | region_name_list ',' namespace_identifier
+                {       result << val[2]                }
 
 const_statement
@@ -1807 +1807 @@
                   string += line
                   # この位置では error メソッドは使えない (token 読出し前)
-                  puts "error: #{file} line #{lineno}: string literal has newline without escape"
+                  puts "#{file}:#{lineno}:#{col}: error: string literal has newline without escape"
                   @@n_error += 1
                 end
@@ -1848 +1848 @@
                   b_in_string = true
                   # この位置では error メソッドは使えない (token 読出し前) # mikan cdl_error ではない
-                  puts "error: #{file} line #{lineno}: string literal has newline without escape"
+                  puts "#{file}:#{lineno}:#{col}: error: string literal has newline without escape"
                   @@n_error += 1
                 # 山括弧で囲まれた文字列
-                when /\A<[0-9A-Za-z_\. \/]+>/   # AB: angle bracke
+                # when /\A<[0-9A-Za-z_\. \/]+>/   # AB: angle bracke
+                when /\A<(?:[^>\\]|\\.)*>/   # これはうまく行くようだ
                   @q << [:AB_STRING_LITERAL, Token.new($&, file, lineno, col)]
                 # 行コメント
@@ -1981 +1982 @@
       end
       if locale then
-        Console.puts "error: #{locale[0]}: line #{locale[1]} #{msg}"
+        Console.puts "#{locale[0]}:#{locale[1]}:#{locale[2]}: error: #{msg}"
       else
         Console.puts "error: #{msg}"
@@ -2014 +2015 @@
       end
       if locale then
-        Console.puts "warning: #{locale[0]}: line #{locale[1]} #{msg}"
+        Console.puts "#{locale[0]}:#{locale[1]}:#{locale[2]}: warning: #{msg}"
       else
         Console.puts "warning: #{msg}"
@@ -2047 +2048 @@
       end
       if locale then
-        Console.puts "info: #{locale[0]}: line #{locale[1]} #{msg}"
+        Console.puts "#{locale[0]}:#{locale[1]}:#{locale[2]}: info: #{msg}"
       else
         Console.puts "info: #{msg}"