git.annexia.org
/
goals.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement tactics.
[goals.git]
/
src
/
parser.mly
diff --git
a/src/parser.mly
b/src/parser.mly
index
f058044
..
3a17124
100644
(file)
--- a/
src/parser.mly
+++ b/
src/parser.mly
@@
-36,6
+36,7
@@
open Printf
%token RIGHT_PAREN
%token <Ast.substs> STRING
%token <string> TACTIC
%token RIGHT_PAREN
%token <Ast.substs> STRING
%token <string> TACTIC
+%token TACTIC_KEYWORD
(* Start nonterminals. *)
%start <Ast.env> file
(* Start nonterminals. *)
%start <Ast.env> file
@@
-67,6
+68,10
@@
stmt:
let name, params = $1 in
name, Ast.EGoal ($loc, (params, [], [], Some $2))
}
let name, params = $1 in
name, Ast.EGoal ($loc, (params, [], [], Some $2))
}
+ | TACTIC_KEYWORD TACTIC params_decl EQUALS CODE
+ {
+ $2, Ast.ETactic ($loc, ($3, $5))
+ }
| LET ID EQUALS expr { $2, $4 }
;
| LET ID EQUALS expr { $2, $4 }
;
@@
-84,7
+89,7
@@
patterns:
| separated_list(COMMA, pattern) { $1 }
;
pattern:
| separated_list(COMMA, pattern) { $1 }
;
pattern:
- | STRING { Ast.PTactic ($loc, "file", [$1]) }
+ | STRING { Ast.PTactic ($loc, "
*
file", [$1]) }
| ID pattern_params { Ast.PTactic ($loc, $1, $2) }
;
pattern_params:
| ID pattern_params { Ast.PTactic ($loc, $1, $2) }
;
pattern_params:
@@
-95,9
+100,9
@@
pattern_param:
;
expr:
;
expr:
- | ID params { Ast.ECall ($loc, $1, $2) }
+ | ID params { Ast.ECall
Goal
($loc, $1, $2) }
| ID { Ast.EVar ($loc, $1) }
| ID { Ast.EVar ($loc, $1) }
- | TACTIC params { Ast.ETactic ($loc, $1, $2) }
+ | TACTIC params { Ast.E
Call
Tactic ($loc, $1, $2) }
| STRING { Ast.ESubsts ($loc, $1) }
| LEFT_ARRAY barelist RIGHT_ARRAY { Ast.EList ($loc, $2) }
;
| STRING { Ast.ESubsts ($loc, $1) }
| LEFT_ARRAY barelist RIGHT_ARRAY { Ast.EList ($loc, $2) }
;