X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=blobdiff_plain;f=src%2Fbin%2Ftools%2Ftestapc.c;h=77b825e2826e80e374b5c282ff06e1419e963a13;hp=755cf74115624e057d46cc05ea2bbb05b14c2bd3;hb=301cac5f6e2edcecf2e1bd89aee5182130a213fc;hpb=b2f14e90d89def30670ff665677842ea491ce947

diff --git a/src/bin/tools/testapc.c b/src/bin/tools/testapc.c
index 755cf74..77b825e 100644
--- a/src/bin/tools/testapc.c
+++ b/src/bin/tools/testapc.c
@@ -9,6 +9,7 @@
 #include <stdio.h>  //print
 #include <errno.h>  //errors
 #include <string.h> //strnlen
+#include <setjmp.h> //non-local jumps
 /* Posix */
 #include <stdlib.h> //exit
 #include <unistd.h> //getopt
@@ -25,11 +26,14 @@
 
 int main(int, char*[]);
 int testapc_yyparse(void);
+int test_yyparse(void);
 
 extern //bison
-int yyparse(void);
+int  yyparse(void);
 extern //lexer.c
 int  lexer_init(void);
+extern //scanner.c
+int  scanner_init(void);
 extern //apc.c
 const char* cargs['Z'];
 
@@ -38,6 +42,9 @@ YYSTYPE yylval;
 extern //lexer.c
 int  lexer(void);
 
+static
+jmp_buf testapc_jump;
+
 /* Ansi Term Colors */
 #define RED     "\x1b[31m"
 #define GREEN   "\x1b[32m"
@@ -54,43 +61,86 @@ int main
 ( int   argc,
   char* argv[]
 )
-{ apc_main(argc, argv);
-  printf(GREEN "PASS\n");
+{ setjmp(testapc_jump);
+  apc_main(argc, argv);
+  printf(GREEN "PASS" CLRC "\n");
   exit(EXIT_SUCCESS);
 }
 
 #define MAX_TOK 1024
 char tok_lval[MAX_TOK];
 
-/* yyparse intercept */
+/* yyparse intercept 
+   tests yyparse internally, then resets the scanner and runs bison's 'yyparse'
+   implementation after validating it with 'test_yyparse'.
+*/
 int testapc_yyparse
+#ifndef YYABORT
+#define YYABORT 1
+#endif
+()
+{ static char bPassedTest = 'f';
+  if (bPassedTest == 'f')
+    { if (test_yyparse())
+	{ printf("Parse test aborted\n");
+	  return YYABORT;
+	}
+      bPassedTest = 't';
+      longjmp(testapc_jump,0);
+    }
+  return yyparse();
+}
+
+/* test_yyparse
+   runs 'lexer' 'PASSES' times, or until finished
+*/
+int test_yyparse
+#define PASSES 1000
 ()
 { int i, tok;
-  static char tok_pattern[] = "[" RED " %5i " CLRC "][" CYAN " %-12i " CLRC "]";
-  for (i = 0; i < 1000; i++)
+  static char* tok_string;
+  static char  tok_pattern[] = "[" RED " %9s " CLRC "][" CYAN " %-12i " CLRC "]";
+  for (i = 0; i < PASSES; i++)
     { switch (tok = lexer())
-    #define OFFS 27
-	{ case STR:
-	  case NAME:
-	    tok_pattern[OFFS] = 's';
-	    break;
-	  case REF:
-	  case FPTR:
-	    tok_pattern[OFFS] = 'x';
-	    break;
-          case NUM:
-          case SS:
-	  case SSD:
+      #define TOFFS 9
+      #define LOFFS 27
+      #define $($)#$
+      #define TOK_CASE(T,C)	                \
+	case T:					\
+	  tok_string = $(T);			\
+	  tok_pattern[LOFFS] = C;		\
+	  break
+	{ TOK_CASE(STR,'s');
+	  TOK_CASE(NAME,'s');
+	  TOK_CASE(REF,'x');
+	  TOK_CASE(FPTR,'x');
+	  TOK_CASE(NUM,'i');
+	  TOK_CASE(SS,'i');
+	  TOK_CASE(SSD,'i');
+	  TOK_CASE(CLOPEN,'i');
+	  TOK_CASE(CLCLOSE,'i');
 	  default:
-	    tok_pattern[OFFS] = 'i';
+	    tok_string = 0;
+	    tok_pattern[LOFFS] = 'i';
 	    break;
           case 0:
-	    printf(";\n" GREEN "Done" CLRC ".\n");
-	    return 0;
+	    goto done;
+	}
+      if (tok_string == NULL)
+	{ tok_pattern[TOFFS] = 'i';
+	  printf(tok_pattern, tok, yylval.val);
+	}
+      else
+	{ tok_pattern[TOFFS] = 's';
+	  printf(tok_pattern, tok_string, yylval.val);
 	}
-      printf(tok_pattern, tok, yylval.val);
-      if (i % 4 == 0 || yylval.val == 1)
+      if (i % 4 == 0 || yylval.val == 0)
 	printf(";\n");
     }
-  printf("\n" CLRC);
+ done:
+  printf(";\n" GREEN "Done" CLRC ".\n");
+  return 0;
+ error:
+  printf(";\n" RED "FAILED" CLRC ".\n");
+  return -1;
 }