X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fparser.mly;h=9b1a91247767be286ec48f691b1c54bca8432837;hb=98b795ddf06271fa8018edcd0bd15960871828fd;hp=b84ac151f228faaad68dbcf950753d33d6deb388;hpb=cd5cb328d707b89caad44b038422d6456c1aee03;p=goals.git

diff --git a/src/parser.mly b/src/parser.mly
index b84ac15..9b1a912 100644
--- a/src/parser.mly
+++ b/src/parser.mly
@@ -21,11 +21,13 @@
 open Utils
 open Printf
 
-(* This is initialized with Lexer.read once the program
- * starts.  Doing this avoids a circular dependency caused
- * by include files.
+(* There are several circular dependencies between the lexer
+ * (caused by includes) and eval.  These references break
+ * the circular dependencies.  They are initialized when
+ * the program starts, hence are never really None.
  *)
 let lexer_read = ref None
+let eval_substitute = ref None
 
 let find_on_include_path filename =
   if not (Filename.is_implicit filename) then filename
@@ -36,31 +38,35 @@ let find_on_include_path filename =
          let path = inc // filename in
          if Sys.file_exists path then path else loop incs
     in
-    loop Cmdline.includes
+    loop (Cmdline.includes ())
   )
 
 let do_include env loc filename optflag file =
-  let filename = Ast.substitute env loc filename in
+  let eval_substitute =
+    match !eval_substitute with None -> assert false | Some f -> f in
+  let filename = eval_substitute env loc filename in
   let filename = find_on_include_path filename in
   if optflag && not (Sys.file_exists filename) then env
   else (
     let fp = open_in filename in
     let lexbuf = Lexing.from_channel fp in
     lexbuf.lex_curr_p <- { lexbuf.lex_curr_p with pos_fname = filename };
-    let reader =
+    let lexer_read =
       match !lexer_read with None -> assert false | Some r -> r in
-    let env' = file reader lexbuf in
+    let env' = file lexer_read lexbuf in
     close_in fp;
     Ast.Env.merge env env'
   )
 %}
 
 (* Tokens. *)
-%token <Ast.substs> CODE
+%token <Ast.code> CODE
 %token COLON
 %token COMMA
 %token EQUALS
 %token EOF
+%token EXPRESSION
+%token FUNCTION
 %token GOAL
 %token <string> ID
 %token INCLUDE
@@ -68,16 +74,20 @@ let do_include env loc filename optflag file =
 %token LEFT_PAREN
 %token LET
 %token OPTINCLUDE
+%token PURE
+%token RETURNING
 %token RIGHT_ARRAY
 %token RIGHT_PAREN
 %token SEMICOLON
 %token <Ast.substs> STRING
-%token <string> TACTIC
-%token TACTIC_KEYWORD
+%token STRING_KEYWORD
+%token STRINGS
+%token <string> PRED
+%token PREDICATE
 
 (* Start nonterminals. *)
 %start <Ast.expr Ast.Env.t> file
-%start <Ast.expr> expr
+%start <Ast.expr> expr_only
 %%
 
 file:
@@ -108,9 +118,17 @@ stmt:
       let name, params = $1 in
       name, Ast.EGoalDefn ($loc, (params, [], [], Some $2))
     }
-    | TACTIC_KEYWORD TACTIC params_decl EQUALS CODE
+    | GOAL ID
     {
-      $2, Ast.ETacticDefn ($loc, ($3, $5))
+      $2, Ast.EGoalDefn ($loc, ([], [], [], None))
+    }
+    | option(PURE) FUNCTION ID params_decl return_decl EQUALS CODE
+    {
+      $3, Ast.EFuncDefn ($loc, ($4, $5, $1 <> None, $7))
+    }
+    | PREDICATE PRED params_decl EQUALS CODE
+    {
+      $2, Ast.EPredDefn ($loc, ($3, $5))
     }
     | LET ID EQUALS expr { $2, $4 }
     ;
@@ -124,13 +142,18 @@ params_decl:
     ;
 param_decl:
     | ID         { $1 }
+return_decl:
+    |            { RetExpr }
+    | RETURNING EXPRESSION { RetExpr }
+    | RETURNING STRINGS { RetStrings }
+    | RETURNING STRING_KEYWORD { RetString }
 
 patterns:
     | separated_list(COMMA, pattern) { $1 }
     ;
 pattern:
-    | STRING     { Ast.PTactic ($loc, "*file", [$1]) }
-    | ID pattern_params { Ast.PTactic ($loc, $1, $2) }
+    | STRING     { Ast.PPred ($loc, "is-file", [$1]) }
+    | PRED pattern_params { Ast.PPred ($loc, $1, $2) }
     ;
 pattern_params:
     | LEFT_PAREN separated_list(COMMA, pattern_param) RIGHT_PAREN { $2 }
@@ -140,15 +163,28 @@ pattern_param:
     ;
 
 expr:
-    | ID params  { Ast.ECallGoal ($loc, $1, $2) }
+    | ID params  { Ast.ECall ($loc, $1, $2) }
     | ID         { Ast.EVar ($loc, $1) }
-    | TACTIC params { Ast.ETacticCtor ($loc, $1, $2) }
+    | PRED params { Ast.EPredCtor ($loc, $1, $2) }
     | STRING     { Ast.ESubsts ($loc, $1) }
     | LEFT_ARRAY barelist RIGHT_ARRAY { Ast.EList ($loc, $2) }
     ;
 barelist:
-    | separated_list(COMMA, expr) { $1 }
+    | right_flexible_list(COMMA, expr) { $1 }
     ;
 params:
     | LEFT_PAREN separated_list(COMMA, expr) RIGHT_PAREN { $2 }
     ;
+
+(* This is used by Parse.parse_expr where we have to parse
+ * a standalone string (eg. from the command line).
+ *)
+expr_only:
+    | expr EOF   { $1 }
+    ;
+
+(* http://gallium.inria.fr/blog/lr-lists/ *)
+right_flexible_list(delim, X):
+    | (* nothing *) { [] }
+    | x = X { [x] }
+    | x = X delim xs = right_flexible_list(delim, X) { x :: xs }