Merge pull request #612 from andreasfertig/cfrontLessStraySemis

Less stray semis in Cfront mode.

Author: andreasfertig

CfrontCodeGenerator.cpp

@@ -863,6 +863,8 @@ void CfrontCodeGenerator::InsertArg(const CXXConstructExpr* stmt)
             // InsertArg(Ref(vd));
         }
 
+        mInsertSemi = false;
+
     } else if(tmpObjectExpr) {
         auto* varNameRef = Ref(mkVarDeclRefExpr(GetName(*tmpObjectExpr), stmt->getType()));
 

tests/EduCfrontReferencesTest.expect

@@ -34,7 +34,6 @@ int __main(void)
   i = i + 2;
   Fun(&i);
   A a;
-  ;
   return 0;
   /* a // lifetime ends here */
   /* f // lifetime ends here */

tests/EduCfrontTest.expect

@@ -79,14 +79,11 @@ inline void Destructor_Other(Other * __this);
 int __main(void)
 {
   Apple a;
-  ;
   Set(&a, 4);
   Apple * paaa = nullptr;
   Set(paaa, 5);
   Apple b;
-  ;
   Apple c;
-  ;
   operatorEqual(&b, &a);
   return 0;
   Destructor_Apple(&c);

tests/EduCfrontTest13.expect

@@ -75,7 +75,6 @@ int __main(void)
   D dvec[5];
   __cxa_vec_ctor(dvec, sizeof(D), 5, 0, (void *(*)(void *))Constructor_D, (void *(*)(void *))NULL);
   E e;
-  ;
   E * ep = Constructor_E((E *)malloc(sizeof(E)));
   if(a) {
     free(a);

tests/EduCfrontTest14.expect

@@ -64,9 +64,7 @@ int __main(void)
   } 
 
   B b1;
-  ;
   B b2;
-  ;
   return 0;
   /* b2 // lifetime ends here */
   /* b1 // lifetime ends here */

tests/EduCfrontTest16.expect

@@ -38,7 +38,6 @@ inline void Destructor_Alloc(Alloc * __this)
 int __main(void)
 {
   Alloc a;
-  ;
   return 0;
   Destructor_Alloc(&a);
   ;

tests/EduCfrontTest17.expect

@@ -32,7 +32,6 @@ typedef struct Foo
 int __main(void)
 {
   Foo<int> f;
-  ;
   return 0;
   /* f // lifetime ends here */
   ;

tests/EduCfrontTest19.expect

@@ -18,7 +18,6 @@ struct Far;
 int __main(void)
 {
   Foo f;
-  ;
   return 0;
   /* f // lifetime ends here */
   ;

tests/EduCfrontTest8.expect

@@ -35,7 +35,6 @@ inline void Destructor_Apple(Apple * __this)
 int __main(void)
 {
   Apple f;
-  ;
   alignas(Apple) char buffer[8] = {'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0'};
   Apple * b = Constructor_Apple((Apple *)(void *)buffer, 4, 5);
   printf("Created\n");

tests/EduCfrontTestCopyAssign.expect

@@ -45,9 +45,7 @@ inline Apple * operatorEqual(Apple * __this, const Apple * __rhs)
 int __main(void)
 {
   Apple a;
-  ;
   Apple b;
-  ;
   operatorEqual(&b, &a);
   return 0;
   Destructor_Apple(&b);