/[cvs]/stack/stack.c
ViewVC logotype

Diff of /stack/stack.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.69 by masse, Mon Feb 11 00:54:04 2002 UTC revision 1.75 by masse, Wed Feb 13 00:16:00 2002 UTC
# Line 9  Line 9 
9  /* strcmp, strcpy, strlen, strcat, strdup */  /* strcmp, strcpy, strlen, strcat, strdup */
10  #include <string.h>  #include <string.h>
11    
12  #define HASHTBLSIZE 65536  #define HASHTBLSIZE 2048
13    
14  /* First, define some types. */  /* First, define some types. */
15    
# Line 59  typedef struct { Line 59  typedef struct {
59    hashtbl symbols;              /* Hash table of all variable bindings */    hashtbl symbols;              /* Hash table of all variable bindings */
60    int err;                      /* Error flag */    int err;                      /* Error flag */
61    int non_eval_flag;    int non_eval_flag;
62      char *in_string;              /* Input pending to be read */
63  } environment;  } environment;
64    
65  /* A type for pointers to external functions */  /* A type for pointers to external functions */
# Line 70  void init_env(environment *env) Line 71  void init_env(environment *env)
71  {  {
72    int i;    int i;
73    
74      env->in_string= NULL;
75    env->err= 0;    env->err= 0;
76    env->non_eval_flag= 0;    env->non_eval_flag= 0;
77    for(i= 0; i<HASHTBLSIZE; i++)    for(i= 0; i<HASHTBLSIZE; i++)
# Line 153  symbol **hash(hashtbl in_hashtbl, const Line 155  symbol **hash(hashtbl in_hashtbl, const
155    }    }
156  }  }
157    
 /* Generic push function. */  
 void push(stackitem** stack_head, stackitem* in_item)  
 {  
   in_item->next= *stack_head;  
   *stack_head= in_item;  
 }  
   
158  /* Push a value onto the stack */  /* Push a value onto the stack */
159  void push_val(stackitem **stack_head, value *val)  void push_val(environment *env, value *val)
160  {  {
161    stackitem *new_item= malloc(sizeof(stackitem));    stackitem *new_item= malloc(sizeof(stackitem));
162    new_item->item= val;    new_item->item= val;
163    val->refcount++;    val->refcount++;
164    push(stack_head, new_item);    new_item->next= env->head;
165      env->head= new_item;
166  }  }
167    
168  /* Push an integer onto the stack. */  /* Push an integer onto the stack. */
169  void push_int(stackitem **stack_head, int in_val)  void push_int(environment *env, int in_val)
170  {  {
171    value *new_value= malloc(sizeof(value));    value *new_value= malloc(sizeof(value));
   stackitem *new_item= malloc(sizeof(stackitem));  
   new_item->item= new_value;  
172        
173    new_value->content.val= in_val;    new_value->content.val= in_val;
174    new_value->type= integer;    new_value->type= integer;
175    new_value->refcount=1;    new_value->refcount=1;
176    
177    push(stack_head, new_item);    push_val(env, new_value);
178  }  }
179    
180  /* Copy a string onto the stack. */  /* Copy a string onto the stack. */
181  void push_cstring(stackitem **stack_head, const char *in_string)  void push_cstring(environment *env, const char *in_string)
182  {  {
183    value *new_value= malloc(sizeof(value));    value *new_value= malloc(sizeof(value));
   stackitem *new_item= malloc(sizeof(stackitem));  
   new_item->item=new_value;  
184    
185    new_value->content.ptr= malloc(strlen(in_string)+1);    new_value->content.ptr= malloc(strlen(in_string)+1);
186    strcpy(new_value->content.ptr, in_string);    strcpy(new_value->content.ptr, in_string);
187    new_value->type= string;    new_value->type= string;
188    new_value->refcount=1;    new_value->refcount=1;
189    
190    push(stack_head, new_item);    push_val(env, new_value);
191  }  }
192    
193  /* Mangle a symbol name to a valid C identifier name */  /* Mangle a symbol name to a valid C identifier name */
# Line 244  extern void mangle(environment *env){ Line 236  extern void mangle(environment *env){
236    new_value->type= string;    new_value->type= string;
237    new_value->refcount=1;    new_value->refcount=1;
238    
239    push_val(&(env->head), new_value);    push_val(env, new_value);
240  }  }
241    
242  /* Push a symbol onto the stack. */  /* Push a symbol onto the stack. */
243  void push_sym(environment *env, const char *in_string)  void push_sym(environment *env, const char *in_string)
244  {  {
   stackitem *new_item;          /* The new stack item */  
   /* ...which will contain... */  
245    value *new_value;             /* A new symbol value */    value *new_value;             /* A new symbol value */
246    /* ...which might point to... */    /* ...which might point to... */
247    symbol **new_symbol;          /* (if needed) A new actual symbol */    symbol **new_symbol;          /* (if needed) A new actual symbol */
# Line 264  void push_sym(environment *env, const ch Line 254  void push_sym(environment *env, const ch
254    const char *dlerr;            /* Dynamic linker error */    const char *dlerr;            /* Dynamic linker error */
255    char *mangled;                /* Mangled function name */    char *mangled;                /* Mangled function name */
256    
   /* Create a new stack item containing a new value */  
   new_item= malloc(sizeof(stackitem));  
257    new_value= malloc(sizeof(value));    new_value= malloc(sizeof(value));
   new_item->item=new_value;  
258    
259    /* The new value is a symbol */    /* The new value is a symbol */
260    new_value->type= symb;    new_value->type= symb;
# Line 311  void push_sym(environment *env, const ch Line 298  void push_sym(environment *env, const ch
298        new_fvalue->refcount= 1;        new_fvalue->refcount= 1;
299      }      }
300    }    }
301    push(&(env->head), new_item);    push_val(env, new_value);
302  }  }
303    
304  /* Print newline. */  /* Print newline. */
# Line 475  extern void rcl(environment *env) Line 462  extern void rcl(environment *env)
462    }    }
463    toss(env);            /* toss the symbol */    toss(env);            /* toss the symbol */
464    if(env->err) return;    if(env->err) return;
465    push_val(&(env->head), val); /* Return its bound value */    push_val(env, val); /* Return its bound value */
466  }  }
467    
 void stack_read(environment*, char*);  
   
468  /* If the top element is a symbol, determine if it's bound to a  /* If the top element is a symbol, determine if it's bound to a
469     function value, and if it is, toss the symbol and execute the     function value, and if it is, toss the symbol and execute the
470     function. */     function. */
# Line 488  extern void eval(environment *env) Line 473  extern void eval(environment *env)
473    funcp in_func;    funcp in_func;
474    value* temp_val;    value* temp_val;
475    stackitem* iterator;    stackitem* iterator;
   char* temp_string;  
476    
477    if(env->head==NULL) {    if(env->head==NULL) {
478      printerr("Too Few Arguments");      printerr("Too Few Arguments");
# Line 523  extern void eval(environment *env) Line 507  extern void eval(environment *env)
507      if(env->err) return;      if(env->err) return;
508      iterator= (stackitem*)temp_val->content.ptr;      iterator= (stackitem*)temp_val->content.ptr;
509      while(iterator!=NULL) {      while(iterator!=NULL) {
510        push_val(&(env->head), iterator->item);        push_val(env, iterator->item);
511        if(env->head->item->type==symb        if(env->head->item->type==symb
512          && strcmp(";", ((symbol*)(env->head->item->content.ptr))->id)==0) {          && strcmp(";", ((symbol*)(env->head->item->content.ptr))->id)==0) {
513          toss(env);          toss(env);
# Line 540  extern void eval(environment *env) Line 524  extern void eval(environment *env)
524      free_val(temp_val);      free_val(temp_val);
525      return;      return;
526    
527      /* If it's a string */    default:
   case string:  
     temp_val= env->head->item;  
     env->head->item->refcount++;  
     toss(env);  
     if(env->err) return;  
     temp_string= malloc(strlen((char*)temp_val->content.ptr)+5);  
     strcpy(temp_string, "[ ");  
     strcpy(temp_string+2, (char*)temp_val->content.ptr);  
     free_val(temp_val);  
     strcat(temp_string, " ]");  
     stack_read(env, temp_string);  
     free(temp_string);  
     goto eval_start;  
   
   case integer:  
528      return;      return;
529    }    }
530  }  }
# Line 590  extern void rev(environment *env){ Line 559  extern void rev(environment *env){
559  /* Make a list. */  /* Make a list. */
560  extern void pack(environment *env)  extern void pack(environment *env)
561  {  {
   void* delimiter;  
562    stackitem *iterator, *temp;    stackitem *iterator, *temp;
563    value *pack;    value *pack;
564    
   delimiter= env->head->item->content.ptr; /* Get delimiter */  
   toss(env);  
   
565    iterator= env->head;    iterator= env->head;
566    
567    if(iterator==NULL || iterator->item->content.ptr==delimiter) {    if(iterator==NULL
568         || (iterator->item->type==symb
569         && ((symbol*)(iterator->item->content.ptr))->id[0]=='[')) {
570      temp= NULL;      temp= NULL;
571      toss(env);      toss(env);
572    } else {    } else {
573      /* Search for first delimiter */      /* Search for first delimiter */
574      while(iterator->next!=NULL      while(iterator->next!=NULL
575            && iterator->next->item->content.ptr!=delimiter)            && (iterator->next->item->type!=symb
576              || ((symbol*)(iterator->next->item->content.ptr))->id[0]!='['))
577        iterator= iterator->next;        iterator= iterator->next;
578            
579      /* Extract list */      /* Extract list */
# Line 623  extern void pack(environment *env) Line 591  extern void pack(environment *env)
591    pack->content.ptr= temp;    pack->content.ptr= temp;
592    pack->refcount= 1;    pack->refcount= 1;
593    
594    temp= malloc(sizeof(stackitem));    push_val(env, pack);
   temp->item= pack;  
   
   push(&(env->head), temp);  
595    rev(env);    rev(env);
596  }  }
597    
 /* Parse input. */  
 void stack_read(environment *env, char *in_line)  
 {  
   char *temp, *rest;  
   int itemp;  
   size_t inlength= strlen(in_line)+1;  
   int convert= 0;  
   
   temp= malloc(inlength);  
   rest= malloc(inlength);  
   
   do {  
     /* If comment */  
     if((convert= sscanf(in_line, "#%[^\n\r]", rest))) {  
       free(temp); free(rest);  
       return;  
     }  
   
     /* If string */  
     if((convert= sscanf(in_line, "\"%[^\"\n\r]\" %[^\n\r]", temp, rest))) {  
       push_cstring(&(env->head), temp);  
       break;  
     }  
     /* If integer */  
     if((convert= sscanf(in_line, "%d %[^\n\r]", &itemp, rest))) {  
       push_int(&(env->head), itemp);  
       break;  
     }  
     /* Escape ';' with '\' */  
     if((convert= sscanf(in_line, "\\%c%[^\n\r]", temp, rest))) {  
       temp[1]= '\0';  
       push_sym(env, temp);  
       break;  
     }  
     /* If symbol */  
     if((convert= sscanf(in_line, "%[^][ ;\n\r]%[^\n\r]", temp, rest))) {  
         push_sym(env, temp);  
         break;  
     }  
     /* If single char */  
     if((convert= sscanf(in_line, "%c%[^\n\r]", temp, rest))) {  
       if(*temp==';') {  
         if(!env->non_eval_flag) {  
           eval(env);            /* Evaluate top element */  
           break;  
         }  
           
         push_sym(env, ";");  
         break;  
       }  
   
       if(*temp==']') {  
         push_sym(env, "[");  
         pack(env);  
         if(env->non_eval_flag)  
           env->non_eval_flag--;  
         break;  
       }  
   
       if(*temp=='[') {  
         push_sym(env, "[");  
         env->non_eval_flag++;  
         break;  
       }  
     }  
   } while(0);  
   
   free(temp);  
   
   if(convert<2) {  
     free(rest);  
     return;  
   }  
     
   stack_read(env, rest);  
     
   free(rest);  
 }  
   
598  /* Relocate elements of the list on the stack. */  /* Relocate elements of the list on the stack. */
599  extern void expand(environment *env)  extern void expand(environment *env)
600  {  {
# Line 765  extern void eq(environment *env) Line 651  extern void eq(environment *env)
651    result= (left==right);    result= (left==right);
652        
653    toss(env); toss(env);    toss(env); toss(env);
654    push_int(&(env->head), result);    push_int(env, result);
655  }  }
656    
657  /* Negates the top element on the stack. */  /* Negates the top element on the stack. */
# Line 787  extern void not(environment *env) Line 673  extern void not(environment *env)
673    
674    val= env->head->item->content.val;    val= env->head->item->content.val;
675    toss(env);    toss(env);
676    push_int(&(env->head), !val);    push_int(env, !val);
677  }  }
678    
679  /* Compares the two top elements on the stack and return 0 if they're the  /* Compares the two top elements on the stack and return 0 if they're the
# Line 893  extern void forget(environment *env) Line 779  extern void forget(environment *env)
779    
780  /* Returns the current error number to the stack */  /* Returns the current error number to the stack */
781  extern void errn(environment *env){  extern void errn(environment *env){
782    push_int(&(env->head), env->err);    push_int(env, env->err);
783  }  }
784    
785  extern void read(environment*);  extern void read(environment*);
# Line 905  int main() Line 791  int main()
791    init_env(&myenv);    init_env(&myenv);
792    
793    while(1) {    while(1) {
794      fprintf(stderr, "okidok\n ");      if(myenv.in_string==NULL)
795          printstack(&myenv);
796      read(&myenv);      read(&myenv);
797      if(myenv.err) {      if(myenv.err) {
798        printf("(error %d) ", myenv.err);        printf("(error %d) ", myenv.err);
799        myenv.err=0;        myenv.err=0;
800      } else if(myenv.head->item->type==symb      } else if(myenv.head!=NULL
801                  && myenv.head->item->type==symb
802                && ((symbol*)(myenv.head->item->content.ptr))->id[0]==';') {                && ((symbol*)(myenv.head->item->content.ptr))->id[0]==';') {
803        toss(&myenv);             /* No error check in main */        toss(&myenv);             /* No error check in main */
804        eval(&myenv);        eval(&myenv);
# Line 946  extern void sx_2b(environment *env) { Line 834  extern void sx_2b(environment *env) {
834      strcpy(new_string, b_val->content.ptr);      strcpy(new_string, b_val->content.ptr);
835      strcat(new_string, a_val->content.ptr);      strcat(new_string, a_val->content.ptr);
836      free_val(a_val); free_val(b_val);      free_val(a_val); free_val(b_val);
837      push_cstring(&(env->head), new_string);      push_cstring(env, new_string);
838      free(new_string);      free(new_string);
839      return;      return;
840    }    }
# Line 966  extern void sx_2b(environment *env) { Line 854  extern void sx_2b(environment *env) {
854      b=env->head->item->content.val;      b=env->head->item->content.val;
855      toss(env);      toss(env);
856      if(env->err) return;      if(env->err) return;
857      push_int(&(env->head), a+b);      push_int(env, a+b);
858    }    }
859  }  }
860    
# Line 995  extern void sx_2d(environment *env) { Line 883  extern void sx_2d(environment *env) {
883      b=env->head->item->content.val;      b=env->head->item->content.val;
884      toss(env);      toss(env);
885      if(env->err) return;      if(env->err) return;
886      push_int(&(env->head), b-a);      push_int(env, b-a);
887    }    }
888  }  }
889    
# Line 1024  extern void sx_3e(environment *env) { Line 912  extern void sx_3e(environment *env) {
912      b=env->head->item->content.val;      b=env->head->item->content.val;
913      toss(env);      toss(env);
914      if(env->err) return;      if(env->err) return;
915      push_int(&(env->head), b>a);      push_int(env, b>a);
916    }    }
917  }  }
918    
# Line 1080  extern void dup(environment *env) { Line 968  extern void dup(environment *env) {
968      env->err=1;      env->err=1;
969      return;      return;
970    }    }
971    push_val(&(env->head), copy_val(env->head->item));    push_val(env, copy_val(env->head->item));
972  }  }
973    
974  /* "if", If-Then */  /* "if", If-Then */
# Line 1171  extern void sx_7768696c65(environment *e Line 1059  extern void sx_7768696c65(environment *e
1059    toss(env); if(env->err) return;    toss(env); if(env->err) return;
1060    
1061    do {    do {
1062      push_val(&(env->head), test);      push_val(env, test);
1063      eval(env);      eval(env);
1064            
1065      if(env->head->item->type != integer) {      if(env->head->item->type != integer) {
# Line 1184  extern void sx_7768696c65(environment *e Line 1072  extern void sx_7768696c65(environment *e
1072      toss(env); if(env->err) return;      toss(env); if(env->err) return;
1073            
1074      if(truth) {      if(truth) {
1075        push_val(&(env->head), loop);        push_val(env, loop);
1076        eval(env);        eval(env);
1077      } else {      } else {
1078        toss(env);        toss(env);
# Line 1225  extern void sx_666f72(environment *env) Line 1113  extern void sx_666f72(environment *env)
1113    iterator= foo->content.ptr;    iterator= foo->content.ptr;
1114    
1115    while(iterator!=NULL) {    while(iterator!=NULL) {
1116      push_val(&(env->head), iterator->item);      push_val(env, iterator->item);
1117      push_val(&(env->head), loop);      push_val(env, loop);
1118      eval(env); if(env->err) return;      eval(env); if(env->err) return;
1119      iterator= iterator->next;      iterator= iterator->next;
1120    }    }
# Line 1238  extern void sx_666f72(environment *env) Line 1126  extern void sx_666f72(environment *env)
1126  /* 'to' */  /* 'to' */
1127  extern void to(environment *env) {  extern void to(environment *env) {
1128    int i, start, ending;    int i, start, ending;
1129      stackitem *temp_head;
1130      value *temp_val;
1131        
1132    if((env->head)==NULL || env->head->next==NULL) {    if((env->head)==NULL || env->head->next==NULL) {
1133      printerr("Too Few Arguments");      printerr("Too Few Arguments");
# Line 1257  extern void to(environment *env) { Line 1147  extern void to(environment *env) {
1147    start= env->head->item->content.val;    start= env->head->item->content.val;
1148    toss(env); if(env->err) return;    toss(env); if(env->err) return;
1149    
1150    push_sym(env, "[");    temp_head= env->head;
1151      env->head= NULL;
1152    
1153    if(ending>=start) {    if(ending>=start) {
1154      for(i= start; i<=ending; i++)      for(i= ending; i>=start; i--)
1155        push_int(&(env->head), i);        push_int(env, i);
1156    } else {    } else {
1157      for(i= start; i>=ending; i--)      for(i= ending; i<=start; i++)
1158        push_int(&(env->head), i);        push_int(env, i);
1159    }    }
1160    
1161    push_sym(env, "[");    temp_val= malloc(sizeof(value));
1162    pack(env); if(env->err) return;    temp_val->content.ptr= env->head;
1163      temp_val->refcount= 1;
1164      temp_val->type= list;
1165      env->head= temp_head;
1166      push_val(env, temp_val);
1167  }  }
1168    
1169  /* Read a string */  /* Read a string */
# Line 1276  extern void readline(environment *env) { Line 1171  extern void readline(environment *env) {
1171    char in_string[101];    char in_string[101];
1172    
1173    fgets(in_string, 100, stdin);    fgets(in_string, 100, stdin);
1174    push_cstring(&(env->head), in_string);    push_cstring(env, in_string);
1175  }  }
1176    
1177  /* Read a value and place on stack */  /* Read a value and place on stack */
1178  extern void read(environment *env) {  extern void read(environment *env) {
1179    const char symbform[]= "%[a-zA-Z0-9!$%*+./:<=>?@^_~-]%100c";    const char symbform[]= "%[a-zA-Z0-9!$%*+./:<=>?@^_~-]%[\001-\377]";
1180    const char strform[]= "\"%[^\"]\"%100c";    const char strform[]= "\"%[^\"]\"%[\001-\377]";
1181    const char intform[]= "%i%100c";    const char intform[]= "%i%[\001-\377]";
1182    const char blankform[]= "%*[ \t]%100c";    const char blankform[]= "%*[ \t]%[\001-\377]";
1183    const char ebrackform[]= "%*1[]]%100c";    const char ebrackform[]= "%*1[]]%[\001-\377]";
1184    const char semicform[]= "%*1[;]%100c";    const char semicform[]= "%*1[;]%[\001-\377]";
1185    const char bbrackform[]= "%*1[[]%100c";    const char bbrackform[]= "%*1[[]%[\001-\377]";
1186    
1187    int itemp, rerun= 0;    int itemp;
1188    static int depth= 0;    static int depth= 0;
1189    char *rest, *match;    char *rest, *match;
   static char *in_string= NULL;  
1190    size_t inlength;    size_t inlength;
1191    
1192    if(in_string==NULL) {    if(env->in_string==NULL) {
1193      readline(env); if(env->err) return;      readline(env); if(env->err) return;
1194            
1195      in_string= malloc(strlen(env->head->item->content.ptr)+1);      env->in_string= malloc(strlen(env->head->item->content.ptr)+1);
1196      strcpy(in_string, env->head->item->content.ptr);      strcpy(env->in_string, env->head->item->content.ptr);
1197      toss(env); if(env->err) return;      toss(env); if(env->err) return;
1198    }    }
1199        
1200    inlength= strlen(in_string)+1;    inlength= strlen(env->in_string)+1;
1201    match= malloc(inlength);    match= malloc(inlength);
1202    rest= malloc(inlength);    rest= malloc(inlength);
1203    
1204    if(sscanf(in_string, blankform, rest)) {    if(sscanf(env->in_string, blankform, rest)) {
1205      rerun= 1;          ;
1206    } else if(sscanf(in_string, intform, &itemp, rest) > 0) {    } else if(sscanf(env->in_string, intform, &itemp, rest) > 0) {
1207      push_int(&(env->head), itemp);      push_int(env, itemp);
1208    } else if(sscanf(in_string, strform, match, rest) > 0) {    } else if(sscanf(env->in_string, strform, match, rest) > 0) {
1209      push_cstring(&(env->head), match);      push_cstring(env, match);
1210    } else if(sscanf(in_string, symbform, match, rest) > 0) {    } else if(sscanf(env->in_string, symbform, match, rest) > 0) {
1211      push_sym(env, match);      push_sym(env, match);
1212    } else if(sscanf(in_string, ebrackform, rest) > 0) {    } else if(sscanf(env->in_string, ebrackform, rest) > 0) {
     push_sym(env, "[");  
1213      pack(env); if(env->err) return;      pack(env); if(env->err) return;
1214      if(depth!=0) depth--;      if(depth!=0) depth--;
1215    } else if(sscanf(in_string, semicform, rest) > 0) {    } else if(sscanf(env->in_string, semicform, rest) > 0) {
1216      push_sym(env, ";");      push_sym(env, ";");
1217    } else if(sscanf(in_string, bbrackform, rest) > 0) {    } else if(sscanf(env->in_string, bbrackform, rest) > 0) {
1218      push_sym(env, "[");      push_sym(env, "[");
1219      depth++;      depth++;
1220    } else {    } else {
1221      free(rest);      free(rest);
1222      rest= NULL;      rest= NULL;
     rerun= 1;  
1223    }    }
1224                
1225    free(in_string);    free(env->in_string);
1226    free(match);    free(match);
1227    
1228    in_string= rest;    env->in_string= rest;
1229    
1230    if(rerun || depth)    if(depth)
1231      return read(env);      return read(env);
1232  }  }
Legend:
Removed from v.1.69  
changed lines
  Added in v.1.75
root@recompile.se
 ViewVC Help
Powered by ViewVC 1.1.26