Changeset 5875

Timestamp:

29/04/09 18:44:10 (3 years ago)

Author:

westram

Message:

• tweaked errors/warnings printed by AISC code generator
• AISC expression 'IF $(KEY)'. When variable KEY is empty or undefined, AISC regards the expression always as TRUE.
  • On OSX this resulted in a bus error, cause the test for operator '!' accessed the byte b4 the empty expression. Fixed.
• made many functions static / commented out unused code
• deleted unused files
• added dependencies (AISC/*pa) to com makefiles -> recompile if any .pa changes

Location:

trunk

Files:

• AISC/aisc.c (modified) (6 diffs)
• AISC/aisc.h (modified) (2 diffs)
• AISC/aisc_commands.c (modified) (49 diffs)
• AISC/aisc_mix.c (modified) (2 diffs)
• AISC/aisc_proto.h (modified) (3 diffs)
• AISC/aisc_var_ref.c (modified) (5 diffs)
• AISC_COM/Makefile (deleted)
• AISC_COM/pb_com.aisc (deleted)
• NAMES_COM/Makefile (modified) (1 diff)
• PROBE_COM/Makefile (modified) (1 diff)

trunk/AISC/aisc.c

@@ -7 +7 @@
 
 const int linebufsize = 200000;
-char      error_buf[256];
+char      string_buf[256]; 
 
 struct global_struct *gl;
@@ -46 +46 @@
 
 
-void
-aisc_init()
+static void aisc_init()
 {
     int             i;
@@ -129 +128 @@
 }
 
-void p_err(const char *error) {
+static void p_err(const char *error) {
     fprintf(stderr, "%s:%i: Error: %s\n", gl->line_path, gl->line_cnt, error);
     gl->error_flag = 1;
 }
 
-void p_err_eof         (void){ p_err("Unexpected end of file seen"); }
-void p_error_brih      (void){ p_err("You tried to insert a bracket in a named field"); }
-void p_error_nobr      (void){ p_err("{} found, missing contents"); }
-void p_error_nocbr     (void){ p_err("missing '}'"); }
-void p_error_emwbr     (void){ p_err("string expected, ',' found"); }
-void p_error_hewnoid   (void){ p_err("string expected, ';' found"); }
-void p_error_mixhnh    (void){ p_err("you cannot use the symbol '@' in this line (or it must be the third symbol in the line)"); }
-void p_error_misscom   (void){ p_err("missing ';'"); }
-void p_error_missco    (void){ p_err("missing ',' or ';' or 'newline'"); }
-void p_error_exp_string(void){ p_err("string expected"); }
-
-char *read_aisc_string(char ** in, int *is_m) {
+static void p_err_eof         (void){ p_err("Unexpected end of file seen"); }
+/* static void p_error_brih      (void){ p_err("You tried to insert a bracket in a named field"); } */
+static void p_error_nobr      (void){ p_err("{} found, missing contents"); }
+static void p_error_nocbr     (void){ p_err("missing '}'"); }
+static void p_error_emwbr     (void){ p_err("string expected, ',' found"); }
+static void p_error_hewnoid   (void){ p_err("string expected, ';' found"); }
+static void p_error_mixhnh    (void){ p_err("you cannot use the symbol '@' in this line (or it must be the third symbol in the line)"); }
+static void p_error_misscom   (void){ p_err("missing ';'"); }
+static void p_error_missco    (void){ p_err("missing ',' or ';' or 'newline'"); }
+static void p_error_exp_string(void){ p_err("string expected"); }
+
+static char *read_aisc_string(char ** in, int *is_m) {
     char           *cp;
     char            buf[1024];
@@ -277 +276 @@
     return (char *) strdup(buf);
 }
-AD *make_AD(void)
-{
-    return (AD *) calloc(sizeof(AD), 1);
-}
-HS *make_HS(void)
-{
-    return (HS *) calloc(sizeof(HS), 1);
-}
-CL *make_CL(void)
-{
-    return (CL *) calloc(sizeof(CL), 1);
-}
+
+static AD *make_AD(void) { return (AD *) calloc(sizeof(AD), 1); }
+static HS *make_HS(void) { return (HS *) calloc(sizeof(HS), 1); }
+CL *make_CL(void) { return (CL *) calloc(sizeof(CL), 1); }
 
 #define ITEM_MAKE       hitem = make_AD();if (item) {   \
@@ -296 +287 @@
     }; item  = hitem; item->first_item = first_item;
 
-AD *read_aisc_line(char ** in, HS ** hs)
+static AD *read_aisc_line(char ** in, HS ** hs)
 {                               /* lese bis zum ;/} */
     static int      is_m;
@@ -463 +454 @@
 }
 
-CL *read_prog(char ** in,char *file)
+static CL *read_prog(char ** in,char *file)
 {
     char *p;

trunk/AISC/aisc.h

@@ -112 +112 @@
 
 extern struct global_struct *gl;
-extern char error_buf[256];
+extern char string_buf[256];
 #define READ_SPACES(var)        while(gl->s3_tab[(unsigned)(*var)]) var++;
 #define READ_RSPACES(var)       while(gl->s3_tab[(unsigned)(*(--var))]);
@@ -122 +122 @@
 #define END_STR2 ')'
 
+#include "aisc_proto.h"
 
+#define aisc_assert(cond) do { if (!(cond)) { *(char*)NULL = 0; } } while(0) /* core dump */
 
+// #define SHOW_CALLER // show where error was raised
+
+#ifdef SHOW_CALLER
+#define print_error(err)                print_error_internal(err, __FILE__, __LINE__)
+#define print_warning(err)              print_warning_internal(err, __FILE__, __LINE__)
+#define printf_error(format, arg)       print_error_internal(formatted(format, arg), __FILE__, __LINE__)
+#else
+#define print_error(err)                print_error_internal(err, NULL, 0)
+#define print_warning(err)              print_warning_internal(err, NULL, 0)
+#define printf_error(format, arg)       print_error_internal(formatted(format, arg), NULL, 0)
+#endif

trunk/AISC/aisc_commands.c

@@ -10 +10 @@
 #include "aisc_proto.h"
 
-int      contains_tabs = 0;
-
-int print_error(const char *err) {
-    /* fprintf(stderr, "ERROR: %s: line %i in file %s\n", err, gl->pc->linenr, gl->pc->path); */
-    fprintf(stderr, "%s:%i: Error: %s\n", gl->pc->path, gl->pc->linenr, err);
-    return 1;
+int contains_tabs = 0;
+static int error_count = 0;
+
+void print_error_internal(const char *err, const char *launcher_file, int launcher_line) {
+    fprintf(stderr, "./%s:%i: Error: %s\n", gl->pc->path, gl->pc->linenr, err);
+    if (launcher_file) fprintf(stderr, "../AISC/%s:%i: error was launched from here\n", launcher_file, launcher_line);
+    error_count++;
+}
+
+void print_warning_internal(const char *err, const char *launcher_file, int launcher_line) {
+    fprintf(stderr, "./%s:%i: Warning: %s\n", gl->pc->path, gl->pc->linenr, err);
+    if (launcher_file) fprintf(stderr, "../AISC/%s:%i: error was launched from here\n", launcher_file, launcher_line);
 }
 
 #define ERRBUFSIZE 200
-
-int printf_error(const char *format, ...) {
+const char *formatted(const char *format, ...) {
     /* goes to header:  __ATTR__FORMAT(1) */
+
     static char *errbuf = 0;
     if (!errbuf) { errbuf = (char*)malloc(ERRBUFSIZE+1); }
@@ -29 +35 @@
     int     chars = vsprintf(errbuf, format, argPtr);
     if (chars>ERRBUFSIZE) {
-        fprintf(stderr, "%s:%i: Error buffer overflow!\n", __FILE__, __LINE__);
+        fprintf(stderr, "%s:%i: Error: Buffer overflow!\n", __FILE__, __LINE__);
         vfprintf(stderr, format, argPtr);
         fputc('\n', stderr);
@@ -38 +44 @@
     va_end(argPtr);
 
-    return print_error(errbuf);
-}
-
+    return errbuf;
+}
 #undef ERRBUFSIZE
 
-void memcopy(char *dest, const char *source, int len)
+static void memcopy(char *dest, const char *source, int len)
 {
     int         i;
@@ -65 +70 @@
 }
 
-char *find_string(const char *str,const char *key)
+static char *find_string(const char *str,const char *key)
 {
     const char *p1,*p2;
@@ -84 +89 @@
 }
 
-char *calc_rest_line(/*const*/ char *str, int size, int presize)
-{                               /* wertet einen Puffer str aus , str[-1] muss exestieren !!! */
+static char *calc_rest_line(/*const*/ char *str, int size, int presize)
+{
+    /* wertet einen Puffer str aus , str[-1] muss exestieren !!! */
     char *ld;
     char *p;
@@ -131 +137 @@
         fi = strpbrk(path, "+,");
         if (!fi) {
-            print_error("NO '+,;' found in ADD FUNKTION");
+            print_error("NO '+,;' found in ADD FUNCTION");
             return 0;
         }
         *(fi++) = 0;
         READ_SPACES(fi);
-        sprintf(error_buf, "%li", atol(path) + atol(fi));
-        fi = strdup(error_buf);
+        sprintf(string_buf, "%li", atol(path) + atol(fi));
+        fi = strdup(string_buf);
     }else if (*p == '*') {
         path = p + 1;
@@ -143 +149 @@
         fi = strpbrk(path, "*,");
         if (!fi) {
-            print_error("NO '*,;' found in ADD FUNKTION");
+            print_error("NO '*,;' found in ADD FUNCTION");
             return 0;
         }
         *(fi++) = 0;
         READ_SPACES(fi);
-        sprintf(error_buf, "%li", atol(path) * atol(fi));
-        fi = strdup(error_buf);
+        sprintf(string_buf, "%li", atol(path) * atol(fi));
+        fi = strdup(string_buf);
     } else if (*p == '#') {
         if (!strncmp(p, "#FILE", 5)) {
@@ -206 +212 @@
 
 
-int
-calc_line(char *str, char *buf)
+static int calc_line(char *str, char *buf)
 {
     char           *ld;
@@ -225 +230 @@
 }
 
-int
-calc_line2(char *str, char *buf)
+static int calc_line2(char *str, char *buf)
 {                               /* erstes $( nicht auswerten ) !!! */
     char           *ld;
@@ -251 +255 @@
 }
 
-void
-write_aisc(AD * ad, FILE * out, int deep)
+static void write_aisc(AD * ad, FILE * out, int deep)
 {
     AD             *item, *line;
@@ -279 +282 @@
 }
 
-void
-write_prg(CL * cl, FILE * out, int deep)
+/*
+static void write_prg(CL * cl, FILE * out, int deep)
 {
     CL             *line;
@@ -290 +293 @@
     }
 }
-
-
-int
-do_com_dbg(char *str)
+*/
+
+static int do_com_dbg(char *str)
 {
     write_aisc(gl->root, stdout, 0);
@@ -299 +301 @@
     return 0;
 }
-int
-do_com_data(char *str)
+static int do_com_data(char *str)
 {
     char           *in;
@@ -319 +320 @@
 }
 
-int
-do_com_write(FILE * out, char *str)
+static int do_com_write(FILE * out, char *str)
 {
     char *p;
@@ -380 +380 @@
                 p = strchr(p, '@');
                 if (!p) {
-                    printf_error("expected '@' after '@SETSOURCE' (injected code)");
+                    print_error("expected '@' after '@SETSOURCE' (injected code)");
                     return 1;
                 }
@@ -401 +401 @@
 }
 
-int
-do_com_print(char *str)
+static int do_com_print(char *str)
 {
     do_com_write(gl->out, str);
     return 0;
 }
-int
-do_com_print2(char *str)
+static int do_com_print2(char *str)
 {
     do_com_write(stdout, str);
@@ -414 +412 @@
 }
 
-int
-do_com_tabstop(char *str)
+static int do_com_tabstop(char *str)
 {
     int             ts, i;
@@ -429 +426 @@
 }
 
-int
-do_com_tab(char *str)
+static int do_com_tab(char *str)
 {
     int             ts, val;
@@ -450 +446 @@
 }
 
-int
-do_com_error(char *str)
+static int do_com_error(char *str)
 {
     print_error(str);
     return 1;
 }
-int do_com_open(char *str)
+
+static int do_com_open(char *str)
 {
     FILE           *file;
@@ -469 +465 @@
     }
     if (strlen(fn) < 3) {
-        print_error("Filename too short (<3)");
+        printf_error("Filename '%s' too short (<3)", fn);
         return 1;
     }
     for (i = 0; i < OPENFILES; i++) {
         if (gl->fouts[i]) {
-            if (!strcmp(gl->fouts[i], str)) {
-                print_error("File already opened");
+            if (strcmp(gl->fouts[i], str) == 0) {
+                printf_error("File '%s' already opened", str);
                 return 1;
             }
@@ -486 +482 @@
     }
     if (i == OPENFILES) {
-        print_error("Too many Files open");
+        print_error("Too many open files");
         return 1;
     }
     file = fopen(fn, "w");
     if (!file) {
-        print_error("Cannot open File");
+        printf_error("Cannot open file '%s'", fn);
         return 1;
     }
@@ -517 +513 @@
 }
 
-int do_com_close(char *str)
+static int do_com_close(char *str)
 {
     int             i;
@@ -541 +537 @@
 }
 
-int do_com_out(char *str)
+static int do_com_out(char *str)
 {
     int             i;
@@ -554 +550 @@
         }
     }
-    print_error("File not opened for OUT Command");
+    printf_error("File '%s' not opened for OUT Command", str);
     return 1;
 }
 
-int do_com_moveto(char *str)
+static int do_com_moveto(char *str)
 {
     AD             *fo;
@@ -590 +586 @@
 }
 
-int do_com_set(char *str)
+static int do_com_set(char *str)
 {
     char           *st;
@@ -611 +607 @@
     def = read_hash_local(st,&hs);
     if (!def) {
-        sprintf(error_buf, "not defined Ident '%s' in SET (use CREATE first)", st);
-        print_error(error_buf);
+        printf_error("undefined Ident '%s' in SET (use CREATE first)", st);
         return 1;
     }
@@ -624 +619 @@
 }
 
-int do_com_create(char *str)
+static int do_com_create(char *str)
 {
     char           *st;
@@ -643 +638 @@
     def = read_hash( gl->st->hs,st);
     if (def) {
-        sprintf(error_buf, "Ident '%s' in CREATE already defined", st);
-        print_error(error_buf);
+        printf_error("Ident '%s' in CREATE already defined", st);
         return 1;
     }
@@ -656 +650 @@
 }
 
-int
-do_com_if(char *str)
+static int do_com_if(char *str)
 {
     char           *equ;
@@ -663 +656 @@
     char           *la;
     char           *kom2;
-    int         op = 0; /* 0=   1~ 2< 3> !+8 */
+
+    int op = 0;                                     /* 0=   1~ 2< 3> !+8 */
     for (equ = str;*equ;equ++) {
         if (*equ =='=') { op = 0; break;}
@@ -670 +664 @@
           if (*equ =='>') { op = 3; break;}*/
     }
-    if (equ[-1] == '!') op +=8;
     la = equ;
-    if (!*la) return 0;
+    if (!*la) { // no operator found -> assume condition true, even if empty or undefined
+        return 0;
+    }
+
+    aisc_assert(equ>str);
+    if (equ[-1] == '!') op += 8;
+
     READ_RSPACES(la);
     *(++la) = 0;
@@ -690 +689 @@
             case 1:     if ( find_string(str, equ)) return 0; break;
             case 9:     if (!find_string(str, equ)) return 0; break;
-            case 2:     if (strcmp(str, equ)< 0) return 0; break;
-            case 10:if (strcmp(str, equ)>=0) return 0; break;
-            case 3:     if (strcmp(str, equ)> 0) return 0; break;
-            case 11:if (strcmp(str, equ)<=0) return 0; break;
+                /* case 2:     if (strcmp(str, equ)< 0) return 0; break; */
+                /* case 10:if (strcmp(str, equ)>=0) return 0; break; */
+                /* case 3:     if (strcmp(str, equ)> 0) return 0; break; */
+                /* case 11:if (strcmp(str, equ) <= 0) return 0; break; */
+            default :
+                printf_error("Unhandled operator (op=%i)", op);
+                return 1;
         }
         equ = kom2;
     }
-    gl->nextpc = gl->pc->ELSE->next;
-    return 0;
-}
-
-int do_com_for_add(CL *co)
+
+    // condition wrong -> goto else
+    gl->nextpc = gl->pc->ELSE->next; 
+    return 0;
+}
+
+static int do_com_for_add(CL *co)
 {
     struct for_data_struct *fd;
@@ -710 +714 @@
 }
 
-int do_com_for_sub(CL *co)
+static int do_com_for_sub(CL *co)
 {
     struct for_data_struct *fd;
@@ -738 +742 @@
 }
 
-int do_com_pop(const char *str)
+static int do_com_pop(const char *str)
 {
     struct stack_struct *st;
@@ -754 +758 @@
 }
 
-int do_com_gosub(char *str)
+static int do_com_gosub(char *str)
 {
     char *fn;
@@ -773 +777 @@
     fn = read_hash(gl->fns,str);
     if (!fn) {
-        print_error("Funktion not found");
+        printf_error("Function '%s' not found", str);
         return 1;
     }
@@ -784 +788 @@
     for (para = params; *para;para=npara,fpara=nfpara){
         if (!*fpara) {
-            sprintf(error_buf,"Too many Parameters %s",para);
-            print_error(error_buf);
+            printf_error("Too many Parameters %s",para);
             return 1;
         }
@@ -795 +798 @@
         *s = 0;
         s = read_hash( gl->st->hs,para);
-        if (s) {        sprintf(error_buf,"duplikated formal parameter %s",para);
-            print_error(error_buf);
+        if (s) {
+            printf_error("duplicated formal parameter %s", para);
             return 1;
         }
@@ -802 +805 @@
     }
     if (*fpara) {
-        sprintf(error_buf,"Too less Parameters %s",fpara);
-        print_error(error_buf);
+        printf_error("Not enough parameters '%s'", fpara);
         return 1;
     }
@@ -811 +813 @@
 }
 
-int do_com_goto(char *str)
+static int do_com_goto(char *str)
 {
     char *fn;
     fn = read_hash(gl->fns,str);
     if (!fn) {
-        print_error("Function not found");
+        printf_error("Function '%s' not found", str);
         return 1;
     }
@@ -823 +825 @@
 }
 
-int do_com_return(char *str)
+static int do_com_return(char *str)
 {
     gl->nextpc = gl->st->pc->next;
@@ -830 +832 @@
     return 0;
 }
-int do_com_exit(char *str)
+static int do_com_exit(char *str)
 {
     str = str;
@@ -836 +838 @@
 }
 
-int
-do_com_for(char *str)
+static int do_com_for(char *str)
 {
     AD             *fo;
@@ -872 +873 @@
         p = (char *) read_hash_local(st, &hs);
         if (!p) {
-            sprintf(error_buf, "not defined Ident '%s' in FOR (use CREATE first)", st);
-            print_error(error_buf);
+            printf_error("Undefined Ident '%s' in FOR (use CREATE first)", st);
             return 1;
         }
-        sprintf(error_buf, "%li", gl->pc->fd->forval);
-        write_hash(hs, st, error_buf);
+        sprintf(string_buf, "%li", gl->pc->fd->forval);
+        write_hash(hs, st, string_buf);
         gl->pc->fd->forstr = strdup(st);
     } else {
@@ -902 +902 @@
 }
 
-int do_com_next(const char *str)
+static int do_com_next(const char *str)
 {
     AD             *fo;
@@ -925 +925 @@
             gl->nextpc = gl->pc->FOR->next;
             p = read_hash_local(gl->pc->FOR->fd->forstr,&hs);
-            sprintf(error_buf, "%li", gl->pc->FOR->fd->forval);
-            write_hash(hs, gl->pc->FOR->fd->forstr, error_buf);
+            sprintf(string_buf, "%li", gl->pc->FOR->fd->forval);
+            write_hash(hs, gl->pc->FOR->fd->forstr, string_buf);
         }
 
@@ -934 +934 @@
 }
 
-#define COMMAND(str,string,len,func)                                    \
-    if ( string[0] == str[0] && !strncmp(string,str,len)) {             \
-        char *s=str+len;                                                \
-        READ_SPACES(s);                                                 \
-        if (func(s)) break;                                             \
-        continue;                                                       \
-    }
-
-#define COMMAND_NOFAIL(str,string,len,func)                             \
-    if ( string[0] == str[0] && !strncmp(string,str,len)) {             \
-        char *s=str+len;                                                \
-        READ_SPACES(s);                                                 \
-        if (func(s)) return -1;                                         \
-        continue;                                                       \
-    }
-
-#define COMMAND2(str,string,len,func)                                   \
-    if ( string[0] == str[0] && !strncmp(string,str,len)) {             \
-        char *s=str+len;                                                \
-        if (func(s)) break;                                             \
-        continue;                                                       \
-    }
-
-#define COMMAND2_NOFAIL(str,string,len,func)                            \
-    if (string[0] == str[0] && !strncmp(string,str,len)) {              \
-        char *s=str+len;                                                \
-        if (func(s)) return -1;                                         \
-        continue;                                                       \
+#define COMMAND(str,string,len,func)                            \
+    if ( string[0] == str[0] && !strncmp(string,str,len)) {     \
+        char *s=str+len;                                        \
+        READ_SPACES(s);                                         \
+        if (func(s)) break;                                     \
+        continue;                                               \
+    }
+
+#define COMMAND_NOFAIL(str,string,len,func)                     \
+    if ( string[0] == str[0] && !strncmp(string,str,len)) {     \
+        char *s=str+len;                                        \
+        READ_SPACES(s);                                         \
+        if (func(s)) return -1;                                 \
+        continue;                                               \
+    }
+
+#define COMMAND2(str,string,len,func)                           \
+    if ( string[0] == str[0] && !strncmp(string,str,len)) {     \
+        char *s=str+len;                                        \
+        if (func(s)) break;                                     \
+        continue;                                               \
+    }
+
+#define COMMAND2_NOFAIL(str,string,len,func)                    \
+    if (string[0] == str[0] && !strncmp(string,str,len)) {      \
+        char *s=str+len;                                        \
+        if (func(s)) return -1;                                 \
+        continue;                                               \
     }
 
@@ -976 +976 @@
                         break;
                     }
+                    
                     if (do_com_if(gl->linebuf))
                         return 1;
@@ -1027 +1028 @@
             return err;
 
-        COMMAND2(gl->linebuf,"PRINT",5,do_com_print)
-            COMMAND2(gl->linebuf,"P ",2,do_com_print)
-            COMMAND2(gl->linebuf,"P\t",2,do_com_print)
-            COMMAND(gl->linebuf,"GOSUB",5,do_com_gosub)
-            COMMAND(gl->linebuf,"CALL",4,do_com_gosub)
-            COMMAND(gl->linebuf,"GOTO",4,do_com_goto)
-            COMMAND(gl->linebuf,"RETURN",6,do_com_return)
-            COMMAND(gl->linebuf,"PUSH",4,do_com_push)
-            COMMAND(gl->linebuf,"POP",3,do_com_pop)
-            COMMAND(gl->linebuf,"CONTINUE",8,do_com_next)
-
-
-            COMMAND(gl->linebuf,"OPEN",4,do_com_open)
-            COMMAND(gl->linebuf,"CLOSE",5,do_com_close)
-            COMMAND(gl->linebuf,"OUT",3,do_com_out)
-            COMMAND2_NOFAIL(gl->linebuf,"ERROR",5,do_com_error)
-            COMMAND(gl->linebuf,"TABSTOP",7,do_com_tabstop)
-            COMMAND(gl->linebuf,"TAB",3,do_com_tab)
-            COMMAND(gl->linebuf,"PP",2,do_com_print2)
-            COMMAND(gl->linebuf,"EXIT",4,do_com_exit)
-            COMMAND_NOFAIL(gl->linebuf,"DATA",4,do_com_data)
-            COMMAND(gl->linebuf,"DBG",3,do_com_dbg)
-            printf_error("Unknown Command '%s'", gl->pc->str);
+        COMMAND2(gl->linebuf,"PRINT",5,do_com_print);
+        COMMAND2(gl->linebuf,"P ",2,do_com_print);
+        COMMAND2(gl->linebuf,"P\t",2,do_com_print);
+        COMMAND(gl->linebuf,"GOSUB",5,do_com_gosub);
+        COMMAND(gl->linebuf,"CALL",4,do_com_gosub);
+        COMMAND(gl->linebuf,"GOTO",4,do_com_goto);
+        COMMAND(gl->linebuf,"RETURN",6,do_com_return);
+        COMMAND(gl->linebuf,"PUSH",4,do_com_push);
+        COMMAND(gl->linebuf,"POP",3,do_com_pop);
+        COMMAND(gl->linebuf,"CONTINUE",8,do_com_next);
+
+
+        COMMAND(gl->linebuf,"OPEN",4,do_com_open);
+        COMMAND(gl->linebuf,"CLOSE",5,do_com_close);
+        COMMAND(gl->linebuf,"OUT",3,do_com_out);
+        COMMAND2_NOFAIL(gl->linebuf,"ERROR",5,do_com_error);
+        COMMAND(gl->linebuf,"TABSTOP",7,do_com_tabstop);
+        COMMAND(gl->linebuf,"TAB",3,do_com_tab);
+        COMMAND(gl->linebuf,"PP",2,do_com_print2);
+        COMMAND(gl->linebuf,"EXIT",4,do_com_exit);
+        COMMAND_NOFAIL(gl->linebuf,"DATA",4,do_com_data);
+        COMMAND(gl->linebuf,"DBG",3,do_com_dbg);
+
+        printf_error("Unknown Command '%s'", gl->pc->str);
         return -1;
     }
-    return 0;
-}
+
+    aisc_assert(error_count == 0);
+    return 0;
+}

trunk/AISC/aisc_mix.c

@@ -221 +221 @@
             free(co->str);
             co->str = s2;
-            sprintf(error_buf,"%li",(long)co);
-            write_hash(gl->fns,buf2,error_buf);
+            sprintf(string_buf,"%li",(long)co);
+            write_hash(gl->fns,buf2,string_buf);
             continue;
         }
@@ -232 +232 @@
             free(co->str);
             co->str = buf2;
-            sprintf(error_buf,"%li",(long)co);
-            write_hash(gl->fns,buf2,error_buf);
-            continue;
-        }
-    }
-    return 0;
-}
-
-int hash_index(const char *key, int size)
+            sprintf(string_buf,"%li",(long)co);
+            write_hash(gl->fns,buf2,string_buf);
+            continue;
+        }
+    }
+    return 0;
+}
+
+static int hash_index(const char *key, int size)
 {
     int         x;

trunk/AISC/aisc_proto.h

@@ -27 +27 @@
 /* aisc.c */
 char *read_aisc_file P_((char *path));
-void aisc_init P_((void));
-void p_err P_((const char *error));
-void p_err_eof P_((void));
-void p_error_brih P_((void));
-void p_error_nobr P_((void));
-void p_error_nocbr P_((void));
-void p_error_emwbr P_((void));
-void p_error_hewnoid P_((void));
-void p_error_mixhnh P_((void));
-void p_error_misscom P_((void));
-void p_error_missco P_((void));
-void p_error_exp_string P_((void));
-char *read_aisc_string P_((char **in, int *is_m));
-AD *make_AD P_((void));
-HS *make_HS P_((void));
 CL *make_CL P_((void));
-AD *read_aisc_line P_((char **in, HS **hs));
 AD *read_aisc P_((char **in));
-CL *read_prog P_((char **in, char *file));
 
 /* aisc_commands.c */
-int print_error P_((const char *err));
-int printf_error P_((const char *format, ...)) __ATTR__FORMAT(1);
-void memcopy P_((char *dest, const char *source, int len));
-char *find_string P_((const char *str, const char *key));
-char *calc_rest_line P_((char *str, int size, int presize));
-int calc_line P_((char *str, char *buf));
-int calc_line2 P_((char *str, char *buf));
-void write_aisc P_((AD *ad, FILE *out, int deep));
-void write_prg P_((CL *cl, FILE *out, int deep));
-int do_com_dbg P_((char *str));
-int do_com_data P_((char *str));
-int do_com_write P_((FILE *out, char *str));
-int do_com_print P_((char *str));
-int do_com_print2 P_((char *str));
-int do_com_tabstop P_((char *str));
-int do_com_tab P_((char *str));
-int do_com_error P_((char *str));
-int do_com_open P_((char *str));
+void print_error_internal P_((const char *err, const char *launcher_file, int launcher_line));
+void print_warning_internal P_((const char *err, const char *launcher_file, int launcher_line));
+const char *formatted P_((const char *format, ...)) __ATTR__FORMAT(1);
 void aisc_remove_files P_((void));
-int do_com_close P_((char *str));
-int do_com_out P_((char *str));
-int do_com_moveto P_((char *str));
-int do_com_set P_((char *str));
-int do_com_create P_((char *str));
-int do_com_if P_((char *str));
-int do_com_for_add P_((CL *co));
-int do_com_for_sub P_((CL *co));
 int do_com_push P_((const char *str));
-int do_com_pop P_((const char *str));
-int do_com_gosub P_((char *str));
-int do_com_goto P_((char *str));
-int do_com_return P_((char *str));
-int do_com_exit P_((char *str));
-int do_com_for P_((char *str));
-int do_com_next P_((const char *str));
 int run_prg P_((void));
 
@@ -88 +41 @@
 CL *aisc_calc_blocks P_((CL *co, CL *afor, CL *aif, int up));
 int aisc_calc_special_commands P_((void));
-int hash_index P_((const char *key, int size));
 struct hash_struct *create_hash P_((int size));
 char *read_hash_local P_((char *key, struct hash_struct **hs));
@@ -96 +48 @@
 
 /* aisc_var_ref.c */
-AD *aisc_match P_((AD *var, char *varid, char *varct));
 AD *aisc_find_var_hier P_((AD *cursor, char *str, int next, int extended, int goup));
 AD *aisc_find_var P_((AD *cursor, char *str, int next, int extended, int goup));

trunk/AISC/aisc_var_ref.c

@@ -6 +6 @@
 #include "aisc_proto.h"
 
-AD *aisc_match(AD * var, char *varid, char *varct) {
+static AD *aisc_match(AD * var, char *varid, char *varct) {
     if (varid) {
         if (strcmp(var->key, varid)) {
@@ -168 +168 @@
                     return 0;
                 }
-                fprintf(stderr, "%s: ", var);
-                print_error("Ident not found");
+                /* fprintf(stderr, "%s: ", var); */
+                printf_error("Ident '%s' not found", var);
                 return 0;
             }
@@ -190 +190 @@
         } else {
             if (cur->sub) {
-                fprintf(stderr, "%s: ", var);
-                print_error("Ident is a Hierarchical Type");
+                printf_error("Ident '%s' is a hierarchical type", var);
                 return 0;
             } else {
@@ -210 +209 @@
             *(nextdp++) = 0;
         if (!doppelpunkt[0]) {
-            print_error("Ident Replacement is missing an '='");
+            print_error("Ident replacement is missing an '='");
             return 0;
         }
@@ -218 +217 @@
             *(bar++) = 0;
         } else {
-            print_error("Ident Replacement is missing an '='");
+            print_error("Ident replacement is missing an '='");
             return 0;
         }

trunk/NAMES_COM/Makefile

@@ -11 +11 @@
 AISC_SAVE = YES
 
+# C++ Compiler
 COMPILER = $(CPP) $(cflags) -I$(ARBHOME)/INCLUDE
 CLIENTCOMPILER = $(COMPILER)
 
-AISC_COMPILER=../AISC/aisc
+# AISC dependencies
+AISC_COMPILER=../MAKEBIN/aisc
+AISC_DEPENDS = $(wildcard AISC/*.pa) $(AISC_COMPILER)
 
 include AISC/export2sub
 
-server.a: $(MAIN_SOURCE) $(PRIVATE_SERVER_OBJECTS:.o=.c) $(PUBLIC_SOURCES) $(AISC_COMPILER)
+server.a: $(MAIN_SOURCE) $(PRIVATE_SERVER_OBJECTS:.o=.c) $(PUBLIC_SOURCES) $(AISC_DEPENDS)
         @$(MAKE) -r -f AISC/Makefile
 

trunk/PROBE_COM/Makefile

@@ -11 +11 @@
 AISC_SAVE := NO
 
+# C++ Compiler
 COMPILER := $(CPP) $(cflags) -I$(ARBHOME)/INCLUDE
 CLIENTCOMPILER := $(COMPILER)
 
-AISC_COMPILER=../AISC/aisc
+# AISC dependencies
+AISC_COMPILER=../MAKEBIN/aisc
+AISC_DEPENDS = $(wildcard AISC/*.pa) $(AISC_COMPILER)
 
 include AISC/export2sub
 
-server.a:       $(MAIN_SOURCE)  $(PRIVATE_SERVER_OBJECTS:.o=.c) $(PUBLIC_SOURCES) $(AISC_COMPILER)
+server.a:       $(MAIN_SOURCE)  $(PRIVATE_SERVER_OBJECTS:.o=.c) $(PUBLIC_SOURCES) $(AISC_DEPENDS)
                 @$(MAKE) -r -f AISC/Makefile