Commit 7dab3424 authored by bguillaum's avatar bguillaum

code cleaning

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/semagramme/libcaml-grew/trunk@6668 7838e531-6607-4d57-9587-6c381814729c
parent 8fd6995d
......@@ -120,7 +120,7 @@ let rule_page_text previous next rule m ast file = "
"<br/>
<br/><h6>Commands</h6>
<code class=code><pre>"^(Ast.AST_HTML.to_html_commands_pretty (List.map fst rule.Ast.commands))^"
<code class=code><pre>"^(Ast.AST_HTML.to_html_commands_pretty rule.Ast.commands)^"
</pre></code><br/><h6>Code</h6><pre>"^
(Ast.AST_HTML.to_html_rules [rule])^
"</pre><br/>
......
This diff is collapsed.
......@@ -52,7 +52,7 @@ type pattern = {
}
type command =
type u_command =
| Del_edge_expl of (Id.name * Id.name * string)
| Del_edge_name of string
| Add_edge of (Id.name * Id.name * string)
......@@ -66,11 +66,12 @@ type command =
| Concat_feat of string * string * string
| Del_feat of string
type command = u_command * Loc.t
type rule = {
rule_id:Id.name;
pos_pattern: pattern;
neg_patterns: pattern list;
commands: (command * Loc.t) list;
commands: command list;
rule_doc:string;
rule_loc: Loc.t;
}
......
......@@ -38,6 +38,6 @@ module Command : sig
| H_SHIFT_EDGE of (gid * gid)
| H_MERGE_NODE of (gid * gid)
val build: ?domain:Ast.domain -> Id.table -> Label.decl array -> (Ast.command * Loc.t) -> t
val build: ?domain:Ast.domain -> Id.table -> Label.decl array -> Ast.command -> t
end
......@@ -379,7 +379,6 @@ module Graph = struct
let node = IntMap.find node_id graph.map in
let new_fs = Feature_structure.del_feat feat_name node.Node.fs in
{graph with map = IntMap.add node_id {node with Node.fs = new_fs} graph.map}
let equals t t' = IntMap.equal (fun node1 node2 -> node1 = node2) t.map t'.map
......
......@@ -285,7 +285,6 @@ neg_item:
| WITHOUT i = pn_item { i }
pn_item:
(* | LACC l = list (pat_item) RACC *)
| l = delimited(LACC,separated_nonempty_list(SEMIC,option(pat_item)),RACC)
{
{
......@@ -344,6 +343,7 @@ feature_value:
full_edge:
(* "e: A -> B" *)
| id = edge_id n1 = IDENT GOTO_NODE n2 = IDENT
| id = edge_id n1 = IDENT LTR_EDGE_LEFT_NEG STAR LTR_EDGE_RIGHT n2 = IDENT
{ localize ({edge_id = Some id; src=n1; edge_labels=[]; tar=n2; negative=true}) }
(* "A -> B" *)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment