[Eliot-dev] Changes to eliot/dic/er.y

[eliot-dev]

Index: eliot/dic/er.y
diff -u eliot/dic/er.y:1.9 eliot/dic/er.y:1.10
--- eliot/dic/er.y:1.9  Sun Oct 23 14:53:43 2005
+++ eliot/dic/er.y      Sat Nov  5 17:56:22 2005
@@ -19,12 +19,12 @@
 /* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
*/
 
 #include <stdio.h>
-#include <malloc.h>  
-#include <stdlib.h> 
+#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "dic.h"
-#include "dic_internals.h" 
+#include "dic_internals.h"
 
 #include "dic.h"
 #include "regexp.h"
@@ -33,26 +33,26 @@
 #include "scanner.h"
 
 
-    /** 
+    /**
      * function prototype for parser generated by bison
      */
-int  regexpparse(yyscan_t scanner, NODE** root, 
+int  regexpparse(yyscan_t scanner, NODE** root,
                 struct search_RegE_list_t *list,
                 struct regexp_error_report_t *err);
     /**
-     * function prototype for error reporting 
+     * function prototype for error reporting
      */
-void regexperror(YYLTYPE *llocp, yyscan_t scanner, NODE** root, 
-                struct search_RegE_list_t *list, 
+void regexperror(YYLTYPE *llocp, yyscan_t scanner, NODE** root,
+                struct search_RegE_list_t *list,
                 struct regexp_error_report_t *err,
                 char const *msg);
 
 
-%}   
+%}
 %union {
   char c;
   NODE *NODE_TYPE;
-  char letters[DIC_LETTERS]; 
+  char letters[DIC_LETTERS];
 };
 
 %defines
@@ -72,9 +72,9 @@
 %token  LEX_USER1
 %token  LEX_USER2
 
-%token  LEX_L_SQBRACKET LEX_R_SQBRACKET 
-%token  LEX_L_BRACKET LEX_R_BRACKET 
-%token  LEX_HAT 
+%token  LEX_L_SQBRACKET LEX_R_SQBRACKET
+%token  LEX_L_BRACKET LEX_R_BRACKET
+%token  LEX_HAT
 
 %token  LEX_QMARK
 %token  LEX_PLUS
@@ -86,27 +86,27 @@
 %type   <letters>   vardis
 %type   <letters>   exprdis
 %type   <NODE_TYPE> exprdisnode
-%start  start        
+%start  start
 %%
 
 start: LEX_L_BRACKET expr LEX_R_BRACKET LEX_SHARP
-       { 
+       {
         NODE* sharp = regexp_createNODE(NODE_VAR,RE_FINAL_TOK,NULL,NULL);
         *root = regexp_createNODE(NODE_AND,'\0',$2,sharp);
-        YYACCEPT; 
+        YYACCEPT;
        }
      ;
 
 
-expr : var                      
+expr : var
        {
         $$=$1;
-       }  
-     | expr expr                
+       }
+     | expr expr
        {
         $$=regexp_createNODE(NODE_AND,'\0',$1,$2);
        }
-     | var LEX_QMARK                 
+     | var LEX_QMARK
        {
         NODE* epsilon=regexp_createNODE(NODE_VAR,RE_EPSILON,NULL,NULL);
         $$=regexp_createNODE(NODE_OR,'\0',$1,epsilon);
@@ -115,25 +115,25 @@
        {
         $$=regexp_createNODE(NODE_PLUS,'\0',$1,NULL);
        }
-     | var LEX_STAR                 
+     | var LEX_STAR
        {
         $$=regexp_createNODE(NODE_STAR,'\0',$1,NULL);
        }
 /* () */
-     | LEX_L_BRACKET expr LEX_R_BRACKET 
+     | LEX_L_BRACKET expr LEX_R_BRACKET
        {
         $$=$2;
        }
-     | LEX_L_BRACKET expr LEX_R_BRACKET LEX_QMARK    
+     | LEX_L_BRACKET expr LEX_R_BRACKET LEX_QMARK
        {
         NODE* epsilon=regexp_createNODE(NODE_VAR,RE_EPSILON,NULL,NULL);
         $$=regexp_createNODE(NODE_OR,'\0',$2,epsilon);
        }
-     | LEX_L_BRACKET expr LEX_R_BRACKET LEX_PLUS    
+     | LEX_L_BRACKET expr LEX_R_BRACKET LEX_PLUS
        {
         $$=regexp_createNODE(NODE_PLUS,'\0',$2,NULL);
        }
-     | LEX_L_BRACKET expr LEX_R_BRACKET LEX_STAR    
+     | LEX_L_BRACKET expr LEX_R_BRACKET LEX_STAR
        {
         $$=regexp_createNODE(NODE_STAR,'\0',$2,NULL);
        }
@@ -155,7 +155,7 @@
        {
         $$=regexp_createNODE(NODE_STAR,'\0',$2,NULL);
        }
-     ;    
+     ;
 
 
 
@@ -165,7 +165,7 @@
         printf("var : lecture %c\n",$1 + 'a' -1);
 #endif
          $$=regexp_createNODE(NODE_VAR,$1,NULL,NULL);
-       }  
+       }
      | LEX_ALL
        {
          $$=regexp_createNODE(NODE_VAR,RE_ALL_MATCH,NULL,NULL);
@@ -215,7 +215,7 @@
               }
           }
         $$=regexp_createNODE(NODE_VAR,list->symbl[i],NULL,NULL);
-       } 
+       }
      | LEX_HAT exprdis
        {
         int i,j;
@@ -249,7 +249,7 @@
 exprdis: vardis
        {
         memcpy($$,$1,sizeof(char)*DIC_LETTERS);
-       }  
+       }
      | vardis exprdis
        {
         int i;
@@ -269,13 +269,13 @@
 #endif
         $$[c] = 1;
        }
-     ; 
+     ;
 
 
 %%
 
-void regexperror(YYLTYPE *llocp, yyscan_t yyscanner, NODE** root, 
-                struct search_RegE_list_t *list, 
+void regexperror(YYLTYPE *llocp, yyscan_t yyscanner, NODE** root,
+                struct search_RegE_list_t *list,
                 struct regexp_error_report_t *err, char const *msg)
 {
   err->pos1 = llocp->first_column;