[Add,Opti] add void return, optimize yyerror

ApostaC · ApostaC · commit 5f21a1fcb22b · 2018-11-06T10:17:36.000+08:00
diff --git a/Eeyore/Eeyore.y b/Eeyore/Eeyore.y
@@ -180,9 +180,8 @@ while_stmt  :   WHILE '(' expr ')' stmt { $$ = new WhileStmt($3, $5);}
             ;
 
 return_stmt :   RETURN expr ';'         { $$ = new ReturnStmt($2); }
-            /*  disable empty return stmt 
-            |   RETURN ';'
-        */
+            |   RETURN ';'              { $$ = new ReturnStmt(); }
+        
             ;
 
 expr        :   IDENTIFIER '=' expr 
@@ -256,7 +255,7 @@ type        :   TOKINT              /* only provide int type currently */
 
 void yyerror(const char *s)
 {
-    fprintf(stderr, "Line: %d -- %s\n", yylineno, s);
+    fprintf(stderr, "Line: %d -- " BOLD_KRED "Error: " KNRM "%s\n", yylineno, s);
 }
 
 void yydebug(const char *s)

Original file line number	Diff line number	Diff line change
`@@ -180,9 +180,8 @@ while_stmt : WHILE '(' expr ')' stmt { $$ = new WhileStmt($3, $5);}`
`180`	`180`	`;`
`181`	`181`
`182`	`182`	`return_stmt : RETURN expr ';' { $$ = new ReturnStmt($2); }`
`183`		`- /* disable empty return stmt`
`184`		`- \| RETURN ';'`
`185`		`- */`
	`183`	`+ \| RETURN ';' { $$ = new ReturnStmt(); }`
	`184`	`+`
`186`	`185`	`;`
`187`	`186`
`188`	`187`	`expr : IDENTIFIER '=' expr`
`@@ -256,7 +255,7 @@ type : TOKINT /* only provide int type currently */`
`256`	`255`
`257`	`256`	`void yyerror(const char *s)`
`258`	`257`	`{`
`259`		`- fprintf(stderr, "Line: %d -- %s\n", yylineno, s);`
	`258`	`+ fprintf(stderr, "Line: %d -- " BOLD_KRED "Error: " KNRM "%s\n", yylineno, s);`
`260`	`259`	`}`
`261`	`260`
`262`	`261`	`void yydebug(const char *s)`