From cd2be692271aad212ed2c9c9b5b0435930123317 Mon Sep 17 00:00:00 2001 From: NovaRain Date: Sat, 16 Nov 2019 07:47:37 +0800 Subject: [PATCH] Changed "Wrong number of args to procedure" to compile error for parser --- parse.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/parse.c b/parse.c index 31fc7e9..07da962 100644 --- a/parse.c +++ b/parse.c @@ -118,8 +118,10 @@ void parseMessageAtNode(const Node* node, const char *format, ...) { va_start(arg, format); i = vsprintf(buf, format, arg); - if(node) parseOutput("[Message] <%s>:%d:%d: %s\n", lexGetFilename(currentInputStream), node->lineNum, node->column, buf); - else parseOutput("[Message] :%d: %s\n", -1, buf); + if (node) + parseOutput("[Message] <%s>:%d:%d: %s\n", lexGetFilename(currentInputStream), node->lineNum, node->column, buf); + else + parseOutput("[Message] :%d: %s\n", -1, buf); va_end(arg); } @@ -132,8 +134,10 @@ void parseWarningAtNode(const Node* node, const char *format, ...) { va_start(arg, format); i = vsprintf(buf, format, arg); - if(node) parseOutput("[Warning] <%s>:%d:%d: %s\n", lexGetFilename(currentInputStream), node->lineNum, node->column, buf); - else parseOutput("[Warning] :%d: %s\n", -1, buf); + if (node) + parseOutput("[Warning] <%s>:%d:%d: %s\n", lexGetFilename(currentInputStream), node->lineNum, node->column, buf); + else + parseOutput("[Warning] :%d: %s\n", -1, buf); va_end(arg); } @@ -177,8 +181,10 @@ void parseErrorAtNode(const Node* node, const char *format, ...) { va_start(arg, format); i = vsprintf(buf, format, arg); - if(node) parseOutput("[Error] <%s>:%d:%d: %s\n", lexGetFilename(currentInputStream), node->lineNum, node->column, buf); - else parseOutput("[Error] :%d: %s\n", -1, buf); + if (node) + parseOutput("[Error] <%s>:%d:%d: %s\n", lexGetFilename(currentInputStream), node->lineNum, node->column, buf); + else + parseOutput("[Error] :%d: %s\n", -1, buf); va_end(arg); compilerErrorTotal++; @@ -1763,7 +1769,7 @@ int procedure(void) { if (p->deftype == 1) { if (p->numArgs != numArgs) { - parseSemanticError("Wrong number of arguments to procedure %s\n", + parseError("Wrong number of arguments to procedure %s\n", getName(p->name, currentProgram->namelist)); } else if (numArgs != minArgs) { parseSemanticError("Default argument values are not allowed for a forward-declared procedure: %s\n",