diff --git a/dtool/src/cppparser/cppBison.yxx b/dtool/src/cppparser/cppBison.yxx
index 7f4e4979e4..21f22a821c 100644
--- a/dtool/src/cppparser/cppBison.yxx
+++ b/dtool/src/cppparser/cppBison.yxx
@@ -2067,7 +2067,7 @@ const_expr_comma:
 }
         | const_expr_comma ',' const_expr
 {
-  $$ = new CPPExpression(',', $1, $3)
+  $$ = new CPPExpression(',', $1, $3);
 }
         ;
 
@@ -2122,71 +2122,71 @@ no_angle_bracket_const_expr:
 }
         | no_angle_bracket_const_expr '*' no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression('*', $1, $3)
+  $$ = new CPPExpression('*', $1, $3);
 }
         | no_angle_bracket_const_expr '/' no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression('/', $1, $3)
+  $$ = new CPPExpression('/', $1, $3);
 }
         | no_angle_bracket_const_expr '%' no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression('%', $1, $3)
+  $$ = new CPPExpression('%', $1, $3);
 }
         | no_angle_bracket_const_expr '+' no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression('+', $1, $3)
+  $$ = new CPPExpression('+', $1, $3);
 }
         | no_angle_bracket_const_expr '-' no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression('-', $1, $3)
+  $$ = new CPPExpression('-', $1, $3);
 }
         | no_angle_bracket_const_expr '|' no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression('|', $1, $3)
+  $$ = new CPPExpression('|', $1, $3);
 }
         | no_angle_bracket_const_expr '&' no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression('&', $1, $3)
+  $$ = new CPPExpression('&', $1, $3);
 }
         | no_angle_bracket_const_expr OROR no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression(OROR, $1, $3)
+  $$ = new CPPExpression(OROR, $1, $3);
 }
         | no_angle_bracket_const_expr ANDAND no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression(ANDAND, $1, $3)
+  $$ = new CPPExpression(ANDAND, $1, $3);
 }
         | no_angle_bracket_const_expr EQCOMPARE no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression(EQCOMPARE, $1, $3)
+  $$ = new CPPExpression(EQCOMPARE, $1, $3);
 }
         | no_angle_bracket_const_expr NECOMPARE no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression(NECOMPARE, $1, $3)
+  $$ = new CPPExpression(NECOMPARE, $1, $3);
 }
         | no_angle_bracket_const_expr LECOMPARE no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression(LECOMPARE, $1, $3)
+  $$ = new CPPExpression(LECOMPARE, $1, $3);
 }
         | no_angle_bracket_const_expr GECOMPARE no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression(GECOMPARE, $1, $3)
+  $$ = new CPPExpression(GECOMPARE, $1, $3);
 }
         | no_angle_bracket_const_expr LSHIFT no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression(LSHIFT, $1, $3)
+  $$ = new CPPExpression(LSHIFT, $1, $3);
 }
         | no_angle_bracket_const_expr RSHIFT no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression(RSHIFT, $1, $3)
+  $$ = new CPPExpression(RSHIFT, $1, $3);
 }
         | no_angle_bracket_const_expr '?' no_angle_bracket_const_expr ':' no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression('?', $1, $3, $5)
+  $$ = new CPPExpression('?', $1, $3, $5);
 }
         | no_angle_bracket_const_expr '[' const_expr ']'
 {
-  $$ = new CPPExpression('[', $1, $3);
+  $$ = new CPPExpression('[', $1, $3);;
 }
         | no_angle_bracket_const_expr '(' const_expr_comma ')'
 {
@@ -2198,11 +2198,11 @@ no_angle_bracket_const_expr:
 }
         | no_angle_bracket_const_expr '.' no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression('.', $1, $3)
+  $$ = new CPPExpression('.', $1, $3);
 }
         | no_angle_bracket_const_expr POINTSAT no_angle_bracket_const_expr
 {
-  $$ = new CPPExpression(POINTSAT, $1, $3)
+  $$ = new CPPExpression(POINTSAT, $1, $3);
 }
         | '(' const_expr_comma ')'
 {
@@ -2335,75 +2335,75 @@ const_expr:
 }
         | const_expr '*' const_expr
 {
-  $$ = new CPPExpression('*', $1, $3)
+  $$ = new CPPExpression('*', $1, $3);
 }
         | const_expr '/' const_expr
 {
-  $$ = new CPPExpression('/', $1, $3)
+  $$ = new CPPExpression('/', $1, $3);
 }
         | const_expr '%' const_expr
 {
-  $$ = new CPPExpression('%', $1, $3)
+  $$ = new CPPExpression('%', $1, $3);
 }
         | const_expr '+' const_expr
 {
-  $$ = new CPPExpression('+', $1, $3)
+  $$ = new CPPExpression('+', $1, $3);
 }
         | const_expr '-' const_expr
 {
-  $$ = new CPPExpression('-', $1, $3)
+  $$ = new CPPExpression('-', $1, $3);
 }
         | const_expr '|' const_expr
 {
-  $$ = new CPPExpression('|', $1, $3)
+  $$ = new CPPExpression('|', $1, $3);
 }
         | const_expr '&' const_expr
 {
-  $$ = new CPPExpression('&', $1, $3)
+  $$ = new CPPExpression('&', $1, $3);
 }
         | const_expr OROR const_expr
 {
-  $$ = new CPPExpression(OROR, $1, $3)
+  $$ = new CPPExpression(OROR, $1, $3);
 }
         | const_expr ANDAND const_expr
 {
-  $$ = new CPPExpression(ANDAND, $1, $3)
+  $$ = new CPPExpression(ANDAND, $1, $3);
 }
         | const_expr EQCOMPARE const_expr
 {
-  $$ = new CPPExpression(EQCOMPARE, $1, $3)
+  $$ = new CPPExpression(EQCOMPARE, $1, $3);
 }
         | const_expr NECOMPARE const_expr
 {
-  $$ = new CPPExpression(NECOMPARE, $1, $3)
+  $$ = new CPPExpression(NECOMPARE, $1, $3);
 }
         | const_expr LECOMPARE const_expr
 {
-  $$ = new CPPExpression(LECOMPARE, $1, $3)
+  $$ = new CPPExpression(LECOMPARE, $1, $3);
 }
         | const_expr GECOMPARE const_expr
 {
-  $$ = new CPPExpression(GECOMPARE, $1, $3)
+  $$ = new CPPExpression(GECOMPARE, $1, $3);
 }
         | const_expr '<' const_expr
 {
-  $$ = new CPPExpression('<', $1, $3)
+  $$ = new CPPExpression('<', $1, $3);
 }
         | const_expr '>' const_expr
 {
-  $$ = new CPPExpression('>', $1, $3)
+  $$ = new CPPExpression('>', $1, $3);
 }
         | const_expr LSHIFT const_expr
 {
-  $$ = new CPPExpression(LSHIFT, $1, $3)
+  $$ = new CPPExpression(LSHIFT, $1, $3);
 }
         | const_expr RSHIFT const_expr
 {
-  $$ = new CPPExpression(RSHIFT, $1, $3)
+  $$ = new CPPExpression(RSHIFT, $1, $3);
 }
         | const_expr '?' const_expr ':' const_expr
 {
-  $$ = new CPPExpression('?', $1, $3, $5)
+  $$ = new CPPExpression('?', $1, $3, $5);
 }
         | const_expr '[' const_expr ']'
 {
@@ -2419,11 +2419,11 @@ const_expr:
 }
         | const_expr '.' const_expr
 {
-  $$ = new CPPExpression('.', $1, $3)
+  $$ = new CPPExpression('.', $1, $3);
 }
         | const_expr POINTSAT const_expr
 {
-  $$ = new CPPExpression(POINTSAT, $1, $3)
+  $$ = new CPPExpression(POINTSAT, $1, $3);
 }
         | '(' const_expr_comma ')'
 {