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

Diff of /stack/stack.c

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

revision 1.70 by masse, Mon Feb 11 01:20:35 2002 UTC revision 1.73 by masse, Tue Feb 12 23:16:56 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 156  symbol **hash(hashtbl in_hashtbl, const Line 156  symbol **hash(hashtbl in_hashtbl, const
156  }  }
157    
158  /* Generic push function. */  /* Generic push function. */
159  void push(stackitem** stack_head, stackitem* in_item)  void push(environment *env, stackitem* in_item)
160  {  {
161    in_item->next= *stack_head;    in_item->next= env->head;
162    *stack_head= in_item;    env->head= in_item;
163  }  }
164    
165  /* Push a value onto the stack */  /* Push a value onto the stack */
166  void push_val(stackitem **stack_head, value *val)  void push_val(environment *env, value *val)
167  {  {
168    stackitem *new_item= malloc(sizeof(stackitem));    stackitem *new_item= malloc(sizeof(stackitem));
169    new_item->item= val;    new_item->item= val;
170    val->refcount++;    val->refcount++;
171    push(stack_head, new_item);    push(env, new_item);
172  }  }
173    
174  /* Push an integer onto the stack. */  /* Push an integer onto the stack. */
175  void push_int(stackitem **stack_head, int in_val)  void push_int(environment *env, int in_val)
176  {  {
177    value *new_value= malloc(sizeof(value));    value *new_value= malloc(sizeof(value));
178    stackitem *new_item= malloc(sizeof(stackitem));    stackitem *new_item= malloc(sizeof(stackitem));
# Line 182  void push_int(stackitem **stack_head, in Line 182  void push_int(stackitem **stack_head, in
182    new_value->type= integer;    new_value->type= integer;
183    new_value->refcount=1;    new_value->refcount=1;
184    
185    push(stack_head, new_item);    push(env, new_item);
186  }  }
187    
188  /* Copy a string onto the stack. */  /* Copy a string onto the stack. */
189  void push_cstring(stackitem **stack_head, const char *in_string)  void push_cstring(environment *env, const char *in_string)
190  {  {
191    value *new_value= malloc(sizeof(value));    value *new_value= malloc(sizeof(value));
192    stackitem *new_item= malloc(sizeof(stackitem));    stackitem *new_item= malloc(sizeof(stackitem));
# Line 197  void push_cstring(stackitem **stack_head Line 197  void push_cstring(stackitem **stack_head
197    new_value->type= string;    new_value->type= string;
198    new_value->refcount=1;    new_value->refcount=1;
199    
200    push(stack_head, new_item);    push(env, new_item);
201  }  }
202    
203  /* Mangle a symbol name to a valid C identifier name */  /* Mangle a symbol name to a valid C identifier name */
# Line 246  extern void mangle(environment *env){ Line 246  extern void mangle(environment *env){
246    new_value->type= string;    new_value->type= string;
247    new_value->refcount=1;    new_value->refcount=1;
248    
249    push_val(&(env->head), new_value);    push_val(env, new_value);
250  }  }
251    
252  /* Push a symbol onto the stack. */  /* Push a symbol onto the stack. */
# Line 313  void push_sym(environment *env, const ch Line 313  void push_sym(environment *env, const ch
313        new_fvalue->refcount= 1;        new_fvalue->refcount= 1;
314      }      }
315    }    }
316    push(&(env->head), new_item);    push(env, new_item);
317  }  }
318    
319  /* Print newline. */  /* Print newline. */
# Line 477  extern void rcl(environment *env) Line 477  extern void rcl(environment *env)
477    }    }
478    toss(env);            /* toss the symbol */    toss(env);            /* toss the symbol */
479    if(env->err) return;    if(env->err) return;
480    push_val(&(env->head), val); /* Return its bound value */    push_val(env, val); /* Return its bound value */
481  }  }
482    
 void stack_read(environment*, char*);  
   
483  /* 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
484     function value, and if it is, toss the symbol and execute the     function value, and if it is, toss the symbol and execute the
485     function. */     function. */
# Line 490  extern void eval(environment *env) Line 488  extern void eval(environment *env)
488    funcp in_func;    funcp in_func;
489    value* temp_val;    value* temp_val;
490    stackitem* iterator;    stackitem* iterator;
   char* temp_string;  
491    
492    if(env->head==NULL) {    if(env->head==NULL) {
493      printerr("Too Few Arguments");      printerr("Too Few Arguments");
# Line 525  extern void eval(environment *env) Line 522  extern void eval(environment *env)
522      if(env->err) return;      if(env->err) return;
523      iterator= (stackitem*)temp_val->content.ptr;      iterator= (stackitem*)temp_val->content.ptr;
524      while(iterator!=NULL) {      while(iterator!=NULL) {
525        push_val(&(env->head), iterator->item);        push_val(env, iterator->item);
526        if(env->head->item->type==symb        if(env->head->item->type==symb
527          && strcmp(";", ((symbol*)(env->head->item->content.ptr))->id)==0) {          && strcmp(";", ((symbol*)(env->head->item->content.ptr))->id)==0) {
528          toss(env);          toss(env);
# Line 542  extern void eval(environment *env) Line 539  extern void eval(environment *env)
539      free_val(temp_val);      free_val(temp_val);
540      return;      return;
541    
542      /* 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:  
543      return;      return;
544    }    }
545  }  }
# Line 592  extern void rev(environment *env){ Line 574  extern void rev(environment *env){
574  /* Make a list. */  /* Make a list. */
575  extern void pack(environment *env)  extern void pack(environment *env)
576  {  {
   void* delimiter;  
577    stackitem *iterator, *temp;    stackitem *iterator, *temp;
578    value *pack;    value *pack;
579    
   delimiter= env->head->item->content.ptr; /* Get delimiter */  
   toss(env);  
   
580    iterator= env->head;    iterator= env->head;
581    
582    if(iterator==NULL || iterator->item->content.ptr==delimiter) {    if(iterator==NULL
583         || (iterator->item->type==symb
584         && ((symbol*)(iterator->item->content.ptr))->id[0]=='[')) {
585      temp= NULL;      temp= NULL;
586      toss(env);      toss(env);
587    } else {    } else {
588      /* Search for first delimiter */      /* Search for first delimiter */
589      while(iterator->next!=NULL      while(iterator->next!=NULL
590            && iterator->next->item->content.ptr!=delimiter)            && (iterator->next->item->type!=symb
591              || ((symbol*)(iterator->next->item->content.ptr))->id[0]!='['))
592        iterator= iterator->next;        iterator= iterator->next;
593            
594      /* Extract list */      /* Extract list */
# Line 628  extern void pack(environment *env) Line 609  extern void pack(environment *env)
609    temp= malloc(sizeof(stackitem));    temp= malloc(sizeof(stackitem));
610    temp->item= pack;    temp->item= pack;
611    
612    push(&(env->head), temp);    push(env, temp);
613    rev(env);    rev(env);
614  }  }
615    
 /* 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);  
 }  
   
616  /* Relocate elements of the list on the stack. */  /* Relocate elements of the list on the stack. */
617  extern void expand(environment *env)  extern void expand(environment *env)
618  {  {
# Line 767  extern void eq(environment *env) Line 669  extern void eq(environment *env)
669    result= (left==right);    result= (left==right);
670        
671    toss(env); toss(env);    toss(env); toss(env);
672    push_int(&(env->head), result);    push_int(env, result);
673  }  }
674    
675  /* Negates the top element on the stack. */  /* Negates the top element on the stack. */
# Line 789  extern void not(environment *env) Line 691  extern void not(environment *env)
691    
692    val= env->head->item->content.val;    val= env->head->item->content.val;
693    toss(env);    toss(env);
694    push_int(&(env->head), !val);    push_int(env, !val);
695  }  }
696    
697  /* 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 895  extern void forget(environment *env) Line 797  extern void forget(environment *env)
797    
798  /* Returns the current error number to the stack */  /* Returns the current error number to the stack */
799  extern void errn(environment *env){  extern void errn(environment *env){
800    push_int(&(env->head), env->err);    push_int(env, env->err);
801  }  }
802    
803  extern void read(environment*);  extern void read(environment*);
# Line 908  int main() Line 810  int main()
810    
811    while(1) {    while(1) {
812      if(myenv.in_string==NULL)      if(myenv.in_string==NULL)
813        printf("okidok\n ");        printstack(&myenv);
814      read(&myenv);      read(&myenv);
815      if(myenv.err) {      if(myenv.err) {
816        printf("(error %d) ", myenv.err);        printf("(error %d) ", myenv.err);
817        myenv.err=0;        myenv.err=0;
818      } else if(myenv.head->item->type==symb      } else if(myenv.head!=NULL
819                  && myenv.head->item->type==symb
820                && ((symbol*)(myenv.head->item->content.ptr))->id[0]==';') {                && ((symbol*)(myenv.head->item->content.ptr))->id[0]==';') {
821        toss(&myenv);             /* No error check in main */        toss(&myenv);             /* No error check in main */
822        eval(&myenv);        eval(&myenv);
# Line 949  extern void sx_2b(environment *env) { Line 852  extern void sx_2b(environment *env) {
852      strcpy(new_string, b_val->content.ptr);      strcpy(new_string, b_val->content.ptr);
853      strcat(new_string, a_val->content.ptr);      strcat(new_string, a_val->content.ptr);
854      free_val(a_val); free_val(b_val);      free_val(a_val); free_val(b_val);
855      push_cstring(&(env->head), new_string);      push_cstring(env, new_string);
856      free(new_string);      free(new_string);
857      return;      return;
858    }    }
# Line 969  extern void sx_2b(environment *env) { Line 872  extern void sx_2b(environment *env) {
872      b=env->head->item->content.val;      b=env->head->item->content.val;
873      toss(env);      toss(env);
874      if(env->err) return;      if(env->err) return;
875      push_int(&(env->head), a+b);      push_int(env, a+b);
876    }    }
877  }  }
878    
# Line 998  extern void sx_2d(environment *env) { Line 901  extern void sx_2d(environment *env) {
901      b=env->head->item->content.val;      b=env->head->item->content.val;
902      toss(env);      toss(env);
903      if(env->err) return;      if(env->err) return;
904      push_int(&(env->head), b-a);      push_int(env, b-a);
905    }    }
906  }  }
907    
# Line 1027  extern void sx_3e(environment *env) { Line 930  extern void sx_3e(environment *env) {
930      b=env->head->item->content.val;      b=env->head->item->content.val;
931      toss(env);      toss(env);
932      if(env->err) return;      if(env->err) return;
933      push_int(&(env->head), b>a);      push_int(env, b>a);
934    }    }
935  }  }
936    
# Line 1083  extern void dup(environment *env) { Line 986  extern void dup(environment *env) {
986      env->err=1;      env->err=1;
987      return;      return;
988    }    }
989    push_val(&(env->head), copy_val(env->head->item));    push_val(env, copy_val(env->head->item));
990  }  }
991    
992  /* "if", If-Then */  /* "if", If-Then */
# Line 1174  extern void sx_7768696c65(environment *e Line 1077  extern void sx_7768696c65(environment *e
1077    toss(env); if(env->err) return;    toss(env); if(env->err) return;
1078    
1079    do {    do {
1080      push_val(&(env->head), test);      push_val(env, test);
1081      eval(env);      eval(env);
1082            
1083      if(env->head->item->type != integer) {      if(env->head->item->type != integer) {
# Line 1187  extern void sx_7768696c65(environment *e Line 1090  extern void sx_7768696c65(environment *e
1090      toss(env); if(env->err) return;      toss(env); if(env->err) return;
1091            
1092      if(truth) {      if(truth) {
1093        push_val(&(env->head), loop);        push_val(env, loop);
1094        eval(env);        eval(env);
1095      } else {      } else {
1096        toss(env);        toss(env);
# Line 1228  extern void sx_666f72(environment *env) Line 1131  extern void sx_666f72(environment *env)
1131    iterator= foo->content.ptr;    iterator= foo->content.ptr;
1132    
1133    while(iterator!=NULL) {    while(iterator!=NULL) {
1134      push_val(&(env->head), iterator->item);      push_val(env, iterator->item);
1135      push_val(&(env->head), loop);      push_val(env, loop);
1136      eval(env); if(env->err) return;      eval(env); if(env->err) return;
1137      iterator= iterator->next;      iterator= iterator->next;
1138    }    }
# Line 1264  extern void to(environment *env) { Line 1167  extern void to(environment *env) {
1167    
1168    if(ending>=start) {    if(ending>=start) {
1169      for(i= start; i<=ending; i++)      for(i= start; i<=ending; i++)
1170        push_int(&(env->head), i);        push_int(env, i);
1171    } else {    } else {
1172      for(i= start; i>=ending; i--)      for(i= start; i>=ending; i--)
1173        push_int(&(env->head), i);        push_int(env, i);
1174    }    }
1175    
   push_sym(env, "[");  
1176    pack(env); if(env->err) return;    pack(env); if(env->err) return;
1177  }  }
1178    
# Line 1279  extern void readline(environment *env) { Line 1181  extern void readline(environment *env) {
1181    char in_string[101];    char in_string[101];
1182    
1183    fgets(in_string, 100, stdin);    fgets(in_string, 100, stdin);
1184    push_cstring(&(env->head), in_string);    push_cstring(env, in_string);
1185  }  }
1186    
1187  /* Read a value and place on stack */  /* Read a value and place on stack */
1188  extern void read(environment *env) {  extern void read(environment *env) {
1189    const char symbform[]= "%[a-zA-Z0-9!$%*+./:<=>?@^_~-]%100c";    const char symbform[]= "%[a-zA-Z0-9!$%*+./:<=>?@^_~-]%[\001-\377]";
1190    const char strform[]= "\"%[^\"]\"%100c";    const char strform[]= "\"%[^\"]\"%[\001-\377]";
1191    const char intform[]= "%i%100c";    const char intform[]= "%i%[\001-\377]";
1192    const char blankform[]= "%*[ \t]%100c";    const char blankform[]= "%*[ \t]%[\001-\377]";
1193    const char ebrackform[]= "%*1[]]%100c";    const char ebrackform[]= "%*1[]]%[\001-\377]";
1194    const char semicform[]= "%*1[;]%100c";    const char semicform[]= "%*1[;]%[\001-\377]";
1195    const char bbrackform[]= "%*1[[]%100c";    const char bbrackform[]= "%*1[[]%[\001-\377]";
1196    
1197    int itemp, rerun= 0;    int itemp;
1198    static int depth= 0;    static int depth= 0;
1199    char *rest, *match;    char *rest, *match;
1200    size_t inlength;    size_t inlength;
# Line 1310  extern void read(environment *env) { Line 1212  extern void read(environment *env) {
1212    rest= malloc(inlength);    rest= malloc(inlength);
1213    
1214    if(sscanf(env->in_string, blankform, rest)) {    if(sscanf(env->in_string, blankform, rest)) {
1215      rerun= 1;          ;
1216    } else if(sscanf(env->in_string, intform, &itemp, rest) > 0) {    } else if(sscanf(env->in_string, intform, &itemp, rest) > 0) {
1217      push_int(&(env->head), itemp);      push_int(env, itemp);
1218    } else if(sscanf(env->in_string, strform, match, rest) > 0) {    } else if(sscanf(env->in_string, strform, match, rest) > 0) {
1219      push_cstring(&(env->head), match);      push_cstring(env, match);
1220    } else if(sscanf(env->in_string, symbform, match, rest) > 0) {    } else if(sscanf(env->in_string, symbform, match, rest) > 0) {
1221      push_sym(env, match);      push_sym(env, match);
1222    } else if(sscanf(env->in_string, ebrackform, rest) > 0) {    } else if(sscanf(env->in_string, ebrackform, rest) > 0) {
     push_sym(env, "[");  
1223      pack(env); if(env->err) return;      pack(env); if(env->err) return;
1224      if(depth!=0) depth--;      if(depth!=0) depth--;
1225    } else if(sscanf(env->in_string, semicform, rest) > 0) {    } else if(sscanf(env->in_string, semicform, rest) > 0) {
# Line 1336  extern void read(environment *env) { Line 1237  extern void read(environment *env) {
1237    
1238    env->in_string= rest;    env->in_string= rest;
1239    
1240    if(rerun || depth)    if(depth)
1241      return read(env);      return read(env);
1242  }  }
Legend:
Removed from v.1.70  
changed lines
  Added in v.1.73
root@recompile.se
 ViewVC Help
Powered by ViewVC 1.1.26