New directory tree, with preprocessor/ inside interpretor/.

[Faustine.git] / interpretor / parser.ml

diff --git a/interpretor/parser.ml b/interpretor/parser.ml
index feec7e2..55e5d6f 100644 (file)
--- a/interpretor/parser.ml
+++ b/interpretor/parser.ml
@@ -1,6 +1,6 @@
 type token =
   | CONST of (string)
 type token =
   | CONST of (string)

-  | IDENT of (string)
+  | IDENT of (Types.symbol)

   | LPAR
   | RPAR
   | SEQ
   | LPAR
   | RPAR
   | SEQ


@@ -12,10 +12,11 @@ type token =
   | POINT
 
 open Parsing;;
   | POINT
 
 open Parsing;;

+let _ = parse_error;;

 # 1 "parser.mly"
  
        open Types 
 # 1 "parser.mly"
  
        open Types 

-# 19 "parser.ml"
+# 20 "parser.ml"

 let yytransl_const = [|
   259 (* LPAR *);
   260 (* RPAR *);
 let yytransl_const = [|
   259 (* LPAR *);
   260 (* RPAR *);


@@ -163,21 +164,21 @@ let yyact = [|
     Obj.repr(
 # 16 "parser.mly"
                                       ( _1 )
     Obj.repr(
 # 16 "parser.mly"
                                       ( _1 )

-# 167 "parser.ml"
+# 168 "parser.ml"

                : Types.faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
     Obj.repr(
 # 17 "parser.mly"
                                       ( Const(N (int_of_string _1)) )
                : Types.faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
     Obj.repr(
 # 17 "parser.mly"
                                       ( Const(N (int_of_string _1)) )

-# 174 "parser.ml"
+# 175 "parser.ml"

                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 1 : string) in
     Obj.repr(
 # 18 "parser.mly"
                                       ( Const(R (float_of_string _1)) )
                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 1 : string) in
     Obj.repr(
 # 18 "parser.mly"
                                       ( Const(R (float_of_string _1)) )

-# 181 "parser.ml"
+# 182 "parser.ml"

                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : string) in
                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : string) in


@@ -185,21 +186,21 @@ let yyact = [|
     Obj.repr(
 # 19 "parser.mly"
                                       ( Const(R (float_of_string (_1 ^ "." ^ _3))) )
     Obj.repr(
 # 19 "parser.mly"
                                       ( Const(R (float_of_string (_1 ^ "." ^ _3))) )

-# 189 "parser.ml"
+# 190 "parser.ml"

                : 'faust_exp))
 ; (fun __caml_parser_env ->
                : 'faust_exp))
 ; (fun __caml_parser_env ->

-    let _1 = (Parsing.peek_val __caml_parser_env 0 : string) in
+    let _1 = (Parsing.peek_val __caml_parser_env 0 : Types.symbol) in

     Obj.repr(
 # 20 "parser.mly"
     Obj.repr(
 # 20 "parser.mly"

-                                      ( Ident(symbol_of_string _1) )
-# 196 "parser.ml"
+                                      ( Ident(_1) )
+# 197 "parser.ml"

                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _2 = (Parsing.peek_val __caml_parser_env 1 : 'faust_exp) in
     Obj.repr(
 # 21 "parser.mly"
                                       ( _2 )
                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _2 = (Parsing.peek_val __caml_parser_env 1 : 'faust_exp) in
     Obj.repr(
 # 21 "parser.mly"
                                       ( _2 )

-# 203 "parser.ml"
+# 204 "parser.ml"

                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : 'faust_exp) in
                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : 'faust_exp) in


@@ -207,7 +208,7 @@ let yyact = [|
     Obj.repr(
 # 22 "parser.mly"
                                       ( Par(_1,_3) )
     Obj.repr(
 # 22 "parser.mly"
                                       ( Par(_1,_3) )

-# 211 "parser.ml"
+# 212 "parser.ml"

                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : 'faust_exp) in
                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : 'faust_exp) in


@@ -215,7 +216,7 @@ let yyact = [|
     Obj.repr(
 # 23 "parser.mly"
                                       ( Split(_1,_3) )
     Obj.repr(
 # 23 "parser.mly"
                                       ( Split(_1,_3) )

-# 219 "parser.ml"
+# 220 "parser.ml"

                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : 'faust_exp) in
                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : 'faust_exp) in


@@ -223,7 +224,7 @@ let yyact = [|
     Obj.repr(
 # 24 "parser.mly"
                                       ( Merge(_1,_3) )
     Obj.repr(
 # 24 "parser.mly"
                                       ( Merge(_1,_3) )

-# 227 "parser.ml"
+# 228 "parser.ml"

                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : 'faust_exp) in
                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : 'faust_exp) in


@@ -231,7 +232,7 @@ let yyact = [|
     Obj.repr(
 # 25 "parser.mly"
                                       ( Seq(_1,_3) )
     Obj.repr(
 # 25 "parser.mly"
                                       ( Seq(_1,_3) )

-# 235 "parser.ml"
+# 236 "parser.ml"

                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : 'faust_exp) in
                : 'faust_exp))
 ; (fun __caml_parser_env ->
     let _1 = (Parsing.peek_val __caml_parser_env 2 : 'faust_exp) in


@@ -239,7 +240,7 @@ let yyact = [|
     Obj.repr(
 # 26 "parser.mly"
                                       ( Rec(_1,_3) )
     Obj.repr(
 # 26 "parser.mly"
                                       ( Rec(_1,_3) )

-# 243 "parser.ml"
+# 244 "parser.ml"

                : 'faust_exp))
 (* Entry main *)
 ; (fun __caml_parser_env -> raise (Parsing.YYexit (Parsing.peek_val __caml_parser_env 0)))
                : 'faust_exp))
 (* Entry main *)
 ; (fun __caml_parser_env -> raise (Parsing.YYexit (Parsing.peek_val __caml_parser_env 0)))