update in basic_2

[helm.git] / helm / www / lambdadelta / bin / xhtbl / textLexer.mll

diff --git a/helm/www/lambdadelta/bin/xhtbl/textLexer.mll b/helm/www/lambdadelta/bin/xhtbl/textLexer.mll
index 7557e7bb80f5ee317f34a18620fabc67b19bb697..4b06e4c402f61044f1f17a99c2713e41fa1e45c2 100644 (file)
--- a/helm/www/lambdadelta/bin/xhtbl/textLexer.mll
+++ b/helm/www/lambdadelta/bin/xhtbl/textLexer.mll
@@ -1,35 +1,47 @@
 {
    module S  = String
+   
    module O  = Options
    module TP = TextParser
    
-   let trim s = S.sub s 1 (S.length s - 2)
-   
    let out s = if !O.debug_lexer then prerr_endline s
 }
 
 let SPC = ['\r' '\n' '\t' ' ']+
-let QT  = '"'
-let STR = QT [^'"']* QT
+let QT  = "\""
 let NUM = ['0'-'9']+
 
 rule token = parse
    | SPC      { token lexbuf                    }
-   | STR as s { out s; TP.TEXT (trim s)         }
+   | QT       { let s = str lexbuf in 
+                out s; TP.TEXT s                }
    | NUM as s { out s; TP.NUM (int_of_string s) }
+   | "(*"     { block lexbuf; token lexbuf      }
    | "{"      { out "{"; TP.OC                  }
    | "}"      { out "}"; TP.CC                  }
    | "["      { out "["; TP.OB                  }
    | "]"      { out "]"; TP.CB                  }   
    | "*"      { out "*"; TP.SR                  }
+   | "^"      { out "^"; TP.CF                  }
    | "+"      { out "+"; TP.PS                  }
+   | "("      { out "("; TP.OP                  }
+   | ")"      { out ")"; TP.CP                  }   
+   | "@"      { out ")"; TP.AT                  }    
+   | "space"  { out "space"; TP.SPACE           }
    | "name"   { out "name"; TP.NAME             }   
    | "table"  { out "table"; TP.TABLE           }
    | "class"  { out "class"; TP.CSS             }
-   | "(*"     { block lexbuf; token lexbuf      }
+   | "uri"    { out "uri"; TP.URI               }
+   | "ext"    { out "ext"; TP.EXT               }
    | eof      { TP.EOF                          }
+and str = parse
+   | QT       { ""                              }
+   | "\\\\"   { "\\" ^ str lexbuf               }
+   | "\\\""   { "\"" ^ str lexbuf               }
+   | _ as c   { S.make 1 c ^ str lexbuf         }
 and block = parse
    | "*)"     { ()                              }
    | "(*"     { block lexbuf; block lexbuf      }
-   | STR      { block lexbuf                    }
+   | QT       { let _ = str lexbuf in
+                block lexbuf                    }
    | _        { block lexbuf                    }