ocaml 3.09 transition

[helm.git] / helm / metadata / extractor / meta_lex_ind.l

diff --git a/helm/metadata/extractor/meta_lex_ind.l b/helm/metadata/extractor/meta_lex_ind.l
index 271bd7db4aa244120c04c30837818f5b5b771ee3..9f474bf85c4a68fad7f21c881901a42b2ba17f9f 100644 (file)
--- a/helm/metadata/extractor/meta_lex_ind.l
+++ b/helm/metadata/extractor/meta_lex_ind.l
@@ -95,7 +95,7 @@ void search(char *uri, int first_child, int position, int depth);
 uri                     [^"]+
 digits                  [0-9]+ 
 value                   [^"]+                  
-id                      [a-zA-Z]([-_a-zA-Z])+
+id                      [a-zA-Z]([-_'a-zA-Z0-9])*
 
  /***************************************************************/
  /* 4. Rules.                                                  */
@@ -156,7 +156,8 @@ id                      [a-zA-Z]([-_a-zA-Z])+
                        position = MAINHYP;
                     else if (position == MAINHYP)
                         { position = INHYP;
-                          no_open_source++;};
+                          no_open_source = 1;}
+                    else if (position == INHYP) no_open_source++;
                    }
 
 "</decl>"          |