X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fgrafite_parser%2FgrafiteParser.ml;h=0dd5c0885e7a1ce6636cd6d765c4fb530b1d5e21;hb=eaf5880ed69963b3ad37cb1f8a1fd48b2918e58b;hp=38a8667d304ae511da33b6abf47971f178922726;hpb=6a5e51c1cf9a56c74a8b53a9b8bc5aa686c9780e;p=helm.git diff --git a/helm/software/components/grafite_parser/grafiteParser.ml b/helm/software/components/grafite_parser/grafiteParser.ml index 38a8667d3..0dd5c0885 100644 --- a/helm/software/components/grafite_parser/grafiteParser.ml +++ b/helm/software/components/grafite_parser/grafiteParser.ml @@ -509,7 +509,7 @@ EXTEND | [ IDENT "inline"]; style = OPT [ IDENT "procedural"; depth = OPT int -> depth ]; suri = QSTRING; prefix = OPT QSTRING; - flavour = OPT [ IDENT "as"; attr = inline_flavour -> attr ]-> + flavour = OPT [ "as"; attr = inline_flavour -> attr ] -> let style = match style with | None -> GrafiteAst.Declarative | Some depth -> GrafiteAst.Procedural depth @@ -537,7 +537,8 @@ EXTEND let alpha = "[a-zA-Z]" in let num = "[0-9]+" in let ident_cont = "\\("^alpha^"\\|"^num^"\\|_\\|\\\\\\)" in - let ident = "\\("^alpha^ident_cont^"*\\|_"^ident_cont^"+\\)" in + let decoration = "\\'" in + let ident = "\\("^alpha^ident_cont^"*"^decoration^"*\\|_"^ident_cont^"+"^decoration^"*\\)" in let rex = Str.regexp ("^"^ident^"$") in if Str.string_match rex id 0 then if (try ignore (UriManager.uri_of_string uri); true