Changeset 306 for asp3_wo_tecs/trunk/utils/gentest.rb

Timestamp:

Jun 27, 2017, 10:53:32 AM (7 years ago)

Author:

ertl-honda

Message:

3.1.0を反映

File:

• asp3_wo_tecs/trunk/utils/gentest.rb (modified) (4 diffs)

asp3_wo_tecs/trunk/utils/gentest.rb

@@ -52 +52 @@
 #  ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#  $Id: gentest.rb 578 2016-02-03 07:23:53Z ertl-hiro $
+#  $Id: gentest.rb 743 2016-04-10 16:00:40Z ertl-hiro $
 # 
 
@@ -62 +62 @@
 #  生成動作を決めるための設定
 #
-$parameterPosition = {
-  "get_tst" => 2,
-  "get_pri" => 2,
-  "get_inf" => 1,
-  "ref_tsk" => 2,
-  "ref_sem" => 2,
-  "ref_flg" => 2,
-  "ref_dtq" => 2,
-  "ref_pdq" => 2,
-  "ref_mtx" => 2,
-  "ref_mbf" => 2,
-  "ref_mpf" => 2,
-  "get_tim" => 1,
-  "ref_cyc" => 2,
-  "ref_alm" => 2,
-  "ref_ovr" => 2,
-  "get_tid" => 1,
-  "iget_tid" => 1,
-  "get_lod" => 2,
-  "get_nth" => 3,
-  "get_ipm" => 1,
-  "wai_flg" => 4,
-  "pol_flg" => 4,
-  "twai_flg" => 4,
-  "rcv_dtq" => 2,
-  "prcv_dtq" => 2,
-  "trcv_dtq" => 2,
+$parameterDefinition = {
+  "get_tst" => { 2 => "STAT" },
+  "get_pri" => { 2 => "PRI" },
+  "get_inf" => { 1 => "intptr_t" },
+  "ref_tsk" => { 2 => "T_RTSK" },
+  "ref_sem" => { 2 => "T_RSEM" },
+  "wai_flg" => { 4 => "FLGPTN" },
+  "pol_flg" => { 4 => "FLGPTN" },
+  "twai_flg" => { 4 => "FLGPTN" },
+  "ref_flg" => { 2 => "T_RFLG" },
+  "rcv_dtq" => { 2 => "intptr_t" },
+  "prcv_dtq" => { 2 => "intptr_t" },
+  "trcv_dtq" => { 2 => "intptr_t" },
+  "ref_dtq" => { 2 => "T_RDTQ" },
+  "rcv_pdq" => { 2 => "intptr_t" , 3 => "PRI" },
+  "prcv_pdq" => { 2 => "intptr_t" , 3 => "PRI" },
+  "trcv_pdq" => { 2 => "intptr_t" , 3 => "PRI" },
+  "ref_pdq" => { 2 => "T_RPDQ" },
+  "ref_mtx" => { 2 => "T_RMTX" },
+  "ref_mbf" => { 2 => "T_RMBF" },
+  "get_mpf" => { 2 => "void *" },
+  "pget_mpf" => { 2 => "void *" },
+  "tget_mpf" => { 2 => "void *" },
+  "ref_mpf" => { 2 => "T_RMPF" },
+  "get_tim" => { 1 => "SYSTIM" },
+  "ref_cyc" => { 2 => "T_RCYC" },
+  "ref_alm" => { 2 => "T_RALM" },
+  "ref_ovr" => { 2 => "T_ROVR" },
+  "get_tid" => { 1 => "ID" },
+  "get_did" => { 1 => "ID" },
+  "get_lod" => { 2 => "uint_t" },
+  "mget_lod" => { 3 => "uint_t" },
+  "get_nth" => { 3 => "ID" },
+  "mget_nth" => { 4 => "ID" },
+  "get_ipm" => { 1 => "PRI" },
+  "get_som" => { 1 => "ID" }
 }
 
-$parameterType = {
-  "get_tst" => "STAT",
-  "get_pri" => "PRI",
-  "get_inf" => "intptr_t",
-  "ref_tsk" => "T_RTSK",
-  "ref_sem" => "T_RSEM",
-  "ref_flg" => "T_RFLG",
-  "ref_dtq" => "T_RDTQ",
-  "ref_pdq" => "T_RPDQ",
-  "ref_mtx" => "T_RMTX",
-  "ref_mbf" => "T_RMBF",
-  "ref_mpf" => "T_RMPF",
-  "get_tim" => "SYSTIM",
-  "ref_cyc" => "T_RCYC",
-  "ref_alm" => "T_RALM",
-  "ref_ovr" => "T_ROVR",
-  "get_tid" => "ID",
-  "iget_tid" => "ID",
-  "get_lod" => "uint_t",
-  "get_nth" => "ID",
-  "get_ipm" => "PRI",
-  "wai_flg" => "FLGPTN",
-  "pol_flg" => "FLGPTN",
-  "twai_flg" => "FLGPTN",
-  "rcv_dtq" => "intptr_t",
-  "prcv_dtq" => "intptr_t",
-  "trcv_dtq" => "intptr_t",
-}
-  
 $functionParameters = {
-  "target_hrt_set_event" => "HRTCNT hrtcnt",
+  "target_hrt_set_event" => "HRTCNT hrtcnt"
 }
   
 $functionValue = {
-  "target_hrt_get_current" => "HRTCNT",
+  "target_hrt_get_current" => "HRTCNT"
 }
   
 $functionReturn = {
-  "target_hrt_get_current" => "0U",
+  "target_hrt_get_current" => "0U"
 }
   
 $functionCheckParameter = {
-  "target_hrt_set_event" => "hrtcnt",
+  "target_hrt_set_event" => "hrtcnt"
 }
 
@@ -246 +226 @@
     print("{\n")
 
-    @variableList.keys.each do |varName|
-      print("\t#{@variableList[varName]}")
-      print(@variableList[varName].length < 4 ? "\t\t" : "\t")
+    @variableList.each do |varName, varType|
+      if /^(.+)\w*\*$/ =~ varType
+        varBaseType = $1
+        print("\t#{varBaseType}")
+        print(varBaseType.length < 4 ? "\t\t*" : "\t*")
+      else
+        print("\t#{varType}")
+        print(varType.length < 4 ? "\t\t" : "\t")
+      end
       print("#{varName};\n")
     end
@@ -296 +282 @@
     params = $2.split(/\s*,\s*/)
 
-    if !$parameterPosition[svcName].nil? \
-                                        && params.size >= $parameterPosition[svcName]
-      varName = params[$parameterPosition[svcName] - 1].sub(/^\&/, "")
-      typeName = $parameterType[svcName]
-      pu.addVariable(varName, typeName)
+    if $parameterDefinition.has_key?(svcName)
+      $parameterDefinition[svcName].each do |pos, type|
+        if params.size >= pos
+          varName = params[pos - 1].sub(/^\&/, "")
+          pu.addVariable(varName, type)
+        end
+      end
     end
   end