Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/tecsgen/tecsmerge.rb

Timestamp:

Jul 3, 2020, 7:19:17 PM (4 years ago)

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/tecsgen/tecsmerge.rb (modified) (4 diffs)

EcnlProtoTool/trunk/asp3_dcre/tecsgen/tecsmerge.rb

@@ -6 +6 @@
 #      Merger for TECS generated templates
 #  
-#   Copyright (C) 2008-2015 by TOPPERS Project
+#   Copyright (C) 2008-2017 by TOPPERS Project
 #--
 #   上記著作権者は，以下の(1)～(4)の条件を満たす場合に限り，本ソフトウェ
@@ -37 +37 @@
 #   の責任を負わない．
 #  
-#   $Id$
+#   $Id: tecsmerge.rb 2633 2017-04-02 06:02:05Z okuma-top $
 #++
 
@@ -44 +44 @@
 #Authors::   大山 博司
 #Version::   
-#Copyright:: Copyright (C) TOPPERS Project, 2008-2015. All rights reserved.
+#Copyright:: Copyright (C) TOPPERS Project, 2008-2017. All rights reserved.
 #License::   TOPPERS ライセンスに準拠
 
@@ -285 +285 @@
 
         next if next_stat == :HEAD || ( next_stat == :EOF && line != nil )
+        # #1002 tecsmerge の非受け口関数 (POSTAMBLE部) の行頭に '{' があるとエラーになる      
+        if (! $old_mode) && ( /^\{/ =~ line ) && ( stat == :PREAMBLE_BODY || stat == :POSTAMBLE_BODY )
+          p line + "  next_stat=" + next_stat.to_s + "stat=" + stat.to_s
+          next
+        end
 
         # p "R: #{stat_info[0]}"