astrolemonade
diff --git a/‎src/express/expparse.y‎
Lines changed: 8 additions & 28 deletions b/‎src/express/expparse.y‎
Lines changed: 8 additions & 28 deletions
@@ -2461,9 +2461,15 @@ while_control(A) ::= TOK_WHILE expression(B).
 }
 
 %syntax_error {
+    Symbol sym;
+
     yyerrstatus++;
-    fprintf(stderr, "Express parser experienced syntax error at line %d.\n", yylineno);
-    fprintf(stderr, "Last token (type %d) had value %x\n", yymajor, yyminor.yy0.val);
+
+    sym.line = yylineno;
+    sym.filename = current_filename;
+
+    ERRORreport_with_symbol(ERROR_syntax, &sym, "",
+	CURRENT_SCOPE_TYPE_PRINTABLE, CURRENT_SCOPE_NAME);
 }
 
 %stack_size 0
@@ -2472,29 +2478,3 @@ while_control(A) ::= TOK_WHILE expression(B).
     fprintf(stderr, "Express parser experienced stack overflow.\n");
     fprintf(stderr, "Last token had value %x\n", yypMinor->yy0.val);
 }
-
-%include {
-static void
-yyerror(const char *yytext, char *string)
-{
-    char buf[200];
-    Symbol sym;
-
-    strcpy(buf, string);
-
-    if (yyeof) {
-	strcat(buf, " at end of input");
-    } else if (yytext[0] == 0) {
-	strcat(buf, " at null character");
-    } else if (yytext[0] < 040 || yytext[0] >= 0177) {
-	sprintf(buf + strlen(buf), " before character 0%o", yytext[0]);
-    } else {
-	sprintf(buf + strlen(buf), " before `%s'", yytext);
-    }
-
-    sym.line = yylineno;
-    sym.filename = current_filename;
-    ERRORreport_with_symbol(ERROR_syntax, &sym, buf,
-	CURRENT_SCOPE_TYPE_PRINTABLE, CURRENT_SCOPE_NAME);
-}
-}