1 files changed, 24 insertions, 35 deletions

diff --git a/lib/qparser/idents.ml b/lib/qparser/idents.ml
index 06bf32a..f96dd95 100644
--- a/lib/qparser/idents.ml
+++ b/lib/qparser/idents.ml
@@ -3,6 +3,20 @@ module T = Qsp_syntax.T
 
 let keyword_table = Hashtbl.create 53
 
+(* Thoses ident are considered as variables and not declared here
+   "BACKIMAGE",
+   "$BACKIMAGE",
+   "BCOLOR",
+   "DEBUG",
+   "DISABLESCROLL"
+   "DISABLESUBEX",
+   "FCOLOR",
+   "$FNAME",
+   "FSIZE",
+   "GC",
+   "LCOLOR",
+   "NOSAVE"
+*)
 let _ =
   List.iter
     (fun (kwd, tok) -> Hashtbl.add keyword_table kwd tok)
@@ -15,11 +29,7 @@ let _ =
       ("AND", AND);
       ("ARRCOMP", FUNCTION T.Arrcomp);
       ("ARRPOS", FUNCTION T.Arrpos);
-      ("ARRSIZE", FUNCTION T.Arrsize)
-      (*
-        ; "BACKIMAGE",        KEYWORD "BACKIMAGE"
-        ; "$BACKIMAGE",       KEYWORD "BACKIMAGE"
-        ; "BCOLOR",           KEYWORD "BCOLOR" *);
+      ("ARRSIZE", FUNCTION T.Arrsize);
       ("CLA", KEYWORD T.Cla);
       ("CLEAR", KEYWORD T.Clear);
       ("*CLEAR", KEYWORD T.Clear');
@@ -35,21 +45,14 @@ let _ =
       ("CURACTS", IDENT "CURACTS");
       ("$CURACTS", IDENT "$CURACTS");
       ("CURLOC", IDENT "CURLOC");
-      ("$CURLOC", IDENT "$CURLOC")
-      (*
-        ; "DEBUG",            KEYWORD "DEBUG"
-*);
+      ("$CURLOC", IDENT "$CURLOC");
       ("DELACT", KEYWORD T.DelAct);
       ("DEL ACT", KEYWORD T.DelAct);
       ("DELLIB", KEYWORD T.FreeLib);
       ("DELOBJ", KEYWORD T.DelObj);
       ("DEL OBJ", KEYWORD T.DelObj);
       ("DESC", FUNCTION T.Desc);
-      ("$DESC", FUNCTION T.Desc')
-      (*
-        ; "DISABLESCROLL",    KEYWORD "DISABLESCROLL"
-        ; "DISABLESUBEX",     KEYWORD "DISABLESUBEX"
-*);
+      ("$DESC", FUNCTION T.Desc');
       ("DYNAMIC", KEYWORD T.Dynamic);
       ("DYNEVAL", FUNCTION T.Dyneval);
       ("$DYNEVAL", FUNCTION T.Dyneval');
@@ -57,23 +60,14 @@ let _ =
       ("ELSEIF", ELIF);
       ("END", END);
       ("EXEC", KEYWORD T.Exec);
-      ("EXIT", KEYWORD T.Exit)
-      (*
-        ; "FCOLOR",           KEYWORD "FCOLOR"
-        ; "$FNAME",           KEYWORD "$FNAME"
-*);
-      ("FREELIB", KEYWORD T.FreeLib)
-      (*
-        ; "FSIZE",            KEYWORD "FSIZE"
-*);
+      ("EXIT", KEYWORD T.Exit);
+      ("FREELIB", KEYWORD T.FreeLib);
       ("FUNC", FUNCTION T.Func);
       ("$FUNC", FUNCTION T.Func');
       ("GETOBJ", FUNCTION T.Getobj);
       ("$GETOBJ", FUNCTION T.Getobj');
       ("GOSUB", KEYWORD T.Gosub);
-      ("GOTO", KEYWORD T.Goto) (*
-        ; "GC",               KEYWORD "GC"
-*);
+      ("GOTO", KEYWORD T.Goto);
       ("GS", KEYWORD T.Gosub);
       ("GT", KEYWORD T.Goto);
       ("IF", IF);
@@ -91,10 +85,7 @@ let _ =
       ("KILLQST", KEYWORD T.FreeLib);
       ("KILLVAR", KEYWORD T.KillVar);
       ("LCASE", FUNCTION T.Lcase);
-      ("$LCASE", FUNCTION T.Lcase')
-      (*
-        ; "LCOLOR",           KEYWORD "LCOLOR"
-*);
+      ("$LCASE", FUNCTION T.Lcase');
       ("LEN", FUNCTION T.Len);
       ("LET", LET);
       ("LOC", FUNCTION T.Loc);
@@ -112,9 +103,7 @@ let _ =
       ("MSG", KEYWORD T.Msg);
       ("NL", KEYWORD T.Nl);
       ("*NL", KEYWORD T.Nl');
-      ("NO", NO) (*
-        ; "NOSAVE",           KEYWORD "NOSAVE"
-*);
+      ("NO", NO);
       ("OBJ", OBJ);
       ("$ONACTSEL", IDENT "$ONACTSEL");
       ("$ONGLOAD", IDENT "$ONGLOAD");
@@ -150,8 +139,8 @@ let _ =
       ("SHOWINPUT", KEYWORD T.ShowInput);
       ("SHOWOBJS", KEYWORD T.ShowObjs);
       ("SHOWSTAT", KEYWORD T.ShowStat);
-      ("STATTXT", FUNCTION T.Stattxt);
-      ("$STATTXT", FUNCTION T.Stattxt');
+      ("STATTXT", IDENT "STATTXT");
+      ("$STATTXT", IDENT "$STATTXT");
       ("STR", FUNCTION T.Str);
       ("$STR", FUNCTION T.Str');
       ("STRCOMP", FUNCTION T.Strcomp);