hellerve/vvm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated test suite and error parsing

Browse Source
This commit is contained in:
Veit Heller
2014-10-12 13:47:24 +02:00
parent 76537151a1
commit 125030c3e0
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vvm/src/vm.c
View File

@@ -194,6 +194,8 @@ program vm_parse(char *filename){
if(strcmp(command[0], "ENTRY") == 0){ if(strcmp(command[0], "ENTRY") == 0){
entry = (int) strtol(command[1], (char **) NULL, 10); entry = (int) strtol(command[1], (char **) NULL, 10);
}else{ }else{
if(strcmp("\n", command[0]) == 0)
continue;
for(i = 1; i < len; i++) for(i = 1; i < len; i++)
if(strcmp(ins[i].name, command[0]) == 0){ if(strcmp(ins[i].name, command[0]) == 0){
code[codep++] = i; code[codep++] = i;
@@ -201,12 +203,19 @@ program vm_parse(char *filename){
break; break;
} }
if(found && ins[i].operands > 0){ if(found == FALSE){
fprintf(stderr,
"Line %s called with unknown command: %s\n",
line, command[0]);
die(127, "Compilation failed.");
}
if(ins[i].operands > 0){
int nargs = ins[i].operands; int nargs = ins[i].operands;
if(nargs != elemc-1){ if(nargs != elemc-1){
fprintf(stderr, fprintf(stderr,
"Line %s called with wrong number of arguments\ "Line %s called with wrong number of arguments (got %d, expected %d)\n",
(got %d, expected %d)\n", line, elemc-1, nargs); line, elemc-1, nargs);
die(127, "Compilation failed."); die(127, "Compilation failed.");
} }
for(i = 1; i <= nargs; i++){ for(i = 1; i <= nargs; i++){