Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@hopper04.(none)>
Thu, 24 Oct 2013 21:39:40 +0000 (14:39 -0700)
committerYanhua Sun <sun51@hopper04.(none)>
Thu, 24 Oct 2013 21:39:40 +0000 (14:39 -0700)
src/xlat-i/sdag/CSdagConstruct.C
tests/charm++/sdag/case/caseTest.ci

index e0b7d838db27557398031edfc34f36efefa55980..17a4886e4b4d7214bf31ca890af80293c0b96d20 100644 (file)
@@ -395,12 +395,13 @@ namespace xi {
       pl = el->entry->param;
       if (!pl->isVoid()) {
         while(pl != NULL) {
-          sv = new CStateVar(pl);
-          stateVarsChildren->push_back(sv);
-          whensEntryMethodStateVars.push_back(sv);
-          whenCurEntry.push_back(sv);
-          el->entry->addEStateVar(sv);
-
+          if (pl->getGivenName() != NULL){//if the parameter doesn't have a name, ignore it 
+            sv = new CStateVar(pl);
+            stateVarsChildren->push_back(sv);
+            whensEntryMethodStateVars.push_back(sv);
+            whenCurEntry.push_back(sv);
+            el->entry->addEStateVar(sv);
+          }
           pl = pl->next;
         }
       }
index 0384e456640db668c248057ea5fb12867fe0d9c3..d6c5abfab2ac43d77c4b9c8a219ac7e627c8183a 100644 (file)
@@ -7,13 +7,13 @@ mainmodule caseTest {
         serial {
           CkPrintf("running\n");
           thisProxy.test2();
-          thisProxy.test1(1); thisProxy.test3();
+          thisProxy.test1(1, 2); thisProxy.test3();
           thisProxy.test5();
         }
 
         case {
           when test2(), test4() serial { CkPrintf("case test2\n"); }
-          when test1(int a), test3() {
+          when test1(int, int b), test3() {
             serial { CkPrintf("case test1, test3\n"); thisProxy.test4(); }
             when test5() serial { CkPrintf("\t => test5\n"); }
           }
@@ -29,10 +29,10 @@ mainmodule caseTest {
       }
     };
 
-    entry void test1(int a);
+    entry void test1(int a, int b);
     entry void test2();
     entry void test3();
     entry void test4();
     entry void test5();
   };
-};
\ No newline at end of file
+};