| CONTEXT of (Ast.anything Ast.befaft * token_info * token_info) ref
| MIXED of (Ast.anything Ast.befaft * token_info * token_info) ref
-type info = { line_start : int; line_end : int;
- logical_start : int; logical_end : int;
+type position_info = { line_start : int; line_end : int;
+ logical_start : int; logical_end : int;
+ column : int; offset : int; }
+
+type info = { pos_info : position_info;
attachable_start : bool; attachable_end : bool;
mcode_start : mcodekind list; mcode_end : mcodekind list;
- column : int; offset : int;
(* the following are only for + code *)
- strings_before : string list; strings_after : string list }
-
-type 'a mcode = 'a * arity * info * mcodekind * meta_pos ref (* pos, - only *)
+ strings_before : (string * position_info) list;
+ strings_after : (string * position_info) list }
+
+(* adjacency index is incremented when we skip over dots or nest delimiters
+it is used in deciding how much to remove, when two adjacent code tokens are
+removed. *)
+type 'a mcode =
+ 'a * arity * info * mcodekind * meta_pos ref (* pos, - only *) *
+ int (* adjacency_index *)
(* int ref is an index *)
and 'a wrap =
{ node : 'a;
(* Initializers *)
and base_initialiser =
- InitExpr of expression
+ MetaInit of Ast.meta_name mcode * pure
+ | InitExpr of expression
| InitList of string mcode (*{*) * initialiser_list * string mcode (*}*)
- | InitGccDotName of
- string mcode (*.*) * ident (* name *) * string mcode (*=*) *
+ | InitGccExt of
+ designator list (* name *) * string mcode (*=*) *
initialiser (* gccext: *)
| InitGccName of ident (* name *) * string mcode (*:*) *
initialiser
- | InitGccIndex of
- string mcode (*[*) * expression * string mcode (*]*) *
- string mcode (*=*) * initialiser
- | InitGccRange of
- string mcode (*[*) * expression * string mcode (*...*) *
- expression * string mcode (*]*) * string mcode (*=*) * initialiser
| IComma of string mcode (* , *)
| Idots of string mcode (* ... *) * initialiser option (* whencode *)
| OptIni of initialiser
| UniqueIni of initialiser
+and designator =
+ DesignatorField of string mcode (* . *) * ident
+ | DesignatorIndex of string mcode (* [ *) * expression * string mcode (* ] *)
+ | DesignatorRange of
+ string mcode (* [ *) * expression * string mcode (* ... *) *
+ expression * string mcode (* ] *)
+
and initialiser = base_initialiser wrap
and initialiser_list = initialiser dots
(rule * Ast.metavar list) * Ast.ruletype
| ScriptRule of
string * Ast.dependency * (string * Ast.meta_name) list * string
+ | InitialScriptRule of string * string
+ | FinalScriptRule of string * string
(* --------------------------------------------------------------------- *)
(* --------------------------------------------------------------------- *)
(* Avoid cluttering the parser. Calculated in compute_lines.ml. *)
-let default_info _ = (* why is this a function? *)
+let pos_info =
{ line_start = -1; line_end = -1;
logical_start = -1; logical_end = -1;
+ column = -1; offset = -1; }
+
+let default_info _ = (* why is this a function? *)
+ { pos_info = pos_info;
attachable_start = true; attachable_end = true;
mcode_start = []; mcode_end = [];
- column = -1; offset = -1; strings_before = []; strings_after = [] }
+ strings_before = []; strings_after = [] }
let default_befaft _ =
MIXED(ref (Ast.NOTHING,default_token_info,default_token_info))
true_if_test_exp = false;
iso_info = [] }
let unwrap x = x.node
-let unwrap_mcode (x,_,_,_,_) = x
+let unwrap_mcode (x,_,_,_,_,_) = x
let rewrap model x = { model with node = x }
-let rewrap_mcode (_,arity,info,mcodekind,pos) x = (x,arity,info,mcodekind,pos)
+let rewrap_mcode (_,arity,info,mcodekind,pos,adj) x =
+ (x,arity,info,mcodekind,pos,adj)
let copywrap model x =
{ model with node = x; index = ref !(model.index);
mcodekind = ref !(model.mcodekind); exp_ty = ref !(model.exp_ty)}
-let get_pos (_,_,_,_,x) = !x
-let get_pos_ref (_,_,_,_,x) = x
-let set_pos pos (m,arity,info,mcodekind,_) = (m,arity,info,mcodekind,ref pos)
+let get_pos (_,_,_,_,x,_) = !x
+let get_pos_ref (_,_,_,_,x,_) = x
+let set_pos pos (m,arity,info,mcodekind,_,adj) =
+ (m,arity,info,mcodekind,ref pos,adj)
let get_info x = x.info
let set_info x info = {x with info = info}
-let get_line x = x.info.line_start
-let get_line_end x = x.info.line_end
+let get_line x = x.info.pos_info.line_start
+let get_line_end x = x.info.pos_info.line_end
let get_index x = !(x.index)
let set_index x i = x.index := i
let get_mcodekind x = !(x.mcodekind)
-let get_mcode_mcodekind (_,_,_,mcodekind,_) = mcodekind
+let get_mcode_mcodekind (_,_,_,mcodekind,_,_) = mcodekind
let get_mcodekind_ref x = x.mcodekind
let set_mcodekind x mk = x.mcodekind := mk
let set_type x t = x.exp_ty := t
let set_test_exp x = {x with true_if_test_exp = true}
let get_iso x = x.iso_info
let set_iso x i = if !Flag.track_iso_usage then {x with iso_info = i} else x
-let set_mcode_data data (_,ar,info,mc,pos) = (data,ar,info,mc,pos)
+let set_mcode_data data (_,ar,info,mc,pos,adj) = (data,ar,info,mc,pos,adj)
(* --------------------------------------------------------------------- *)
(* this function is a rather minimal attempt. the problem is that information
has been lost. but since it is only used for metavariable types in the isos,
perhaps it doesn't matter *)
-and make_mcode x = (x,NONE,default_info(),context_befaft(),ref NoMetaPos)
-let make_mcode_info x info = (x,NONE,info,context_befaft(),ref NoMetaPos)
+and make_mcode x = (x,NONE,default_info(),context_befaft(),ref NoMetaPos,-1)
+let make_mcode_info x info = (x,NONE,info,context_befaft(),ref NoMetaPos,-1)
exception TyConv