[Eliot-dev] Changes to eliot/dic/dic_search.c

[eliot-dev]

Index: eliot/dic/dic_search.c
diff -u eliot/dic/dic_search.c:1.12 eliot/dic/dic_search.c:1.13
--- eliot/dic/dic_search.c:1.12 Sun Oct 23 14:53:43 2005
+++ eliot/dic/dic_search.c      Fri Nov  4 20:00:06 2005
@@ -17,10 +17,6 @@
 /* along with this program; if not, write to the Free Software               */
 /* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
*/
 
-/*
- * $Id: dic_search.c,v 1.12 2005/10/23 14:53:43 ipkiss Exp $
- */
-
 /**
  *  \file dic_search.h
  *  \brief  Dictionary lookup functions
@@ -344,8 +340,8 @@
 
 
 void
-Dic_search_cross_rec(struct params_cross_t *params, 
-                    char wordlist[RES_CROS_MAX][DIC_WORD_MAX], 
+Dic_search_cross_rec(struct params_cross_t *params,
+                    char wordlist[RES_CROS_MAX][DIC_WORD_MAX],
                     Dawg_edge *edgeptr)
 {
   Dawg_edge *current = params->dic->dawg + edgeptr->ptr;
@@ -420,7 +416,7 @@
 struct params_regexp_t {
   Dictionary dic;
   automaton automaton;
-  struct search_RegE_list_t *charlist;  
+  struct search_RegE_list_t *charlist;
   char word[DIC_WORD_MAX];
   int  wordlen;
   int  wordlistlen;
@@ -428,9 +424,9 @@
 };
 
 void
-Dic_search_regexp_rec(struct params_regexp_t *params, 
+Dic_search_regexp_rec(struct params_regexp_t *params,
                      int state,
-                     Dawg_edge *edgeptr, 
+                     Dawg_edge *edgeptr,
                      char wordlist[RES_REGE_MAX][DIC_WORD_MAX])
 {
   int next_state;
@@ -442,7 +438,7 @@
        {
          strcpy(wordlist[params->wordlistlen++],params->word);
        }
-    }  
+    }
   /* we now drive the search by exploring the dictionary */
   current = params->dic->dawg + edgeptr->ptr;
   do {
@@ -461,10 +457,10 @@
 }
 
 
-    /** 
+    /**
      * 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);
 
@@ -474,8 +470,8 @@
                struct search_RegE_list_t *list)
 {
   int i,p,n,value;
-  int ptl[REGEXP_MAX+1]; 
-  int PS [REGEXP_MAX+1]; 
+  int ptl[REGEXP_MAX+1];
+  int PS [REGEXP_MAX+1];
   NODE* root;
   yyscan_t scanner;
   YY_BUFFER_STATE buf;
@@ -516,7 +512,7 @@
 #ifdef DEBUG_FLEX_IS_BROKEN
       fprintf(stderr,"parser error at pos %d - %d : %s\n",
              report.pos1, report.pos2, report.msg);
-#endif      
+#endif
       regexp_delete_tree(root);
       return ;
     }
@@ -539,7 +535,7 @@
       params.wordlistlen    = 0;
       params.wordlistlenmax = RES_REGE_MAX;
       Dic_search_regexp_rec(&params, automaton_get_init(a), dic->dawg + 
dic->root, wordlist);
-      
+
       automaton_delete(a);
     }
   regexp_delete_tree(root);