%token <Ast.substs> CODE
%token COLON
%token COMMA
-%token <string> ID
%token EQUALS
%token EOF
%token GOAL
+%token <string> ID
%token LEFT_ARRAY
%token LEFT_PAREN
%token LET
%token RIGHT_ARRAY
%token RIGHT_PAREN
%token <Ast.substs> STRING
+%token <string> TACTIC
(* Start nonterminals. *)
%start <Ast.env> file
stmts:
| list(stmt)
{ List.fold_left (
- fun env (name, expr) -> Ast.StringMap.add name expr env
- ) Ast.StringMap.empty $1
+ fun env (name, expr) -> Ast.Env.add name expr env
+ ) Ast.Env.empty $1
}
;
stmt:
{ let name, params =
match $1 with
| None ->
- let pos = $startpos in
- sprintf "_goal@%d" pos.pos_lnum, []
+ sprintf "_goal@%d" $startpos.pos_lnum, []
| Some x -> x in
- name, Ast.EGoal (params, $2, $4, $5)
+ name, Ast.EGoal ($loc, (params, $2, $4, $5))
}
| goal_stmt CODE
{
let name, params = $1 in
- name, Ast.EGoal (params, [], [], Some $2)
+ name, Ast.EGoal ($loc, (params, [], [], Some $2))
}
| LET ID EQUALS expr { $2, $4 }
;
goal_stmt:
- | GOAL ID option(param_decl) EQUALS
+ | GOAL ID option(params_decl) EQUALS
{ $2, match $3 with None -> [] | Some ps -> ps }
;
-param_decl:
- | LEFT_PAREN separated_list(COMMA, ID) RIGHT_PAREN { $2 }
+params_decl:
+ | LEFT_PAREN separated_list(COMMA, param_decl) RIGHT_PAREN { $2 }
;
+param_decl:
+ | ID { $1 }
patterns:
| separated_list(COMMA, pattern) { $1 }
;
pattern:
- | STRING { Ast.PTactic ("file", [$1]) }
- | ID pattern_params { Ast.PTactic ($1, $2) }
- | ID { Ast.PVarSubst $1 }
+ | STRING { Ast.PTactic ($loc, "file", [$1]) }
+ | ID pattern_params { Ast.PTactic ($loc, $1, $2) }
+ | ID { Ast.PVar ($loc, $1) }
;
pattern_params:
| LEFT_PAREN separated_list(COMMA, pattern_param) RIGHT_PAREN { $2 }
;
expr:
- | ID params { Ast.ECall ($1, $2) }
- | ID { Ast.EVar $1 (* This might be replaced with ECall later. *) }
- | STRING { Ast.ESubsts $1 }
- | LEFT_ARRAY barelist RIGHT_ARRAY { Ast.EList $2 }
+ | ID params { Ast.ECall ($loc, $1, $2) }
+ | ID { Ast.EVar ($loc, $1) }
+ | TACTIC params { Ast.ETactic ($loc, $1, $2) }
+ | STRING { Ast.ESubsts ($loc, $1) }
+ | LEFT_ARRAY barelist RIGHT_ARRAY { Ast.EList ($loc, $2) }
;
barelist:
| separated_list(COMMA, expr) { $1 }