Commit 0284c161 authored by POTTIER Francois's avatar POTTIER Francois

Re-generated expected output. The only differences are in the white space.

parent 90ddced9
......@@ -231,7 +231,6 @@ let string_of_constant c =
%token <Annotation.t> XMLtag_close
%token <Annotation.t * string> XMLtext
%token <Annotation.t> XMLwhitespace
%type <string AST.program> program
%%
......
......@@ -233,20 +233,20 @@ Warning: symbol integer_list is unreachable from any of the start symbol(s).
%token UPDATE_SUFFIX
%token UPSERT_WITH
%token UPSERT_WITH_BEFORE
%right RARROW
%right LRARROW
%right ELSE IF THEN
%right CASE OF
%right CONCAT
%left OR
%left AND
%left EQ GEQ GT LEQ LT NEQ
%left MINUS PLUS
%left DIVIDE MODULO TIMES
%left ANNOTATE
%right NEG NOT
%left COLON
%nonassoc UMINUS
%right RARROW
%right LRARROW
%right ELSE IF THEN
%right CASE OF
%right CONCAT
%left OR
%left AND
%left EQ GEQ GT LEQ LT NEQ
%left MINUS PLUS
%left DIVIDE MODULO TIMES
%left ANNOTATE
%right NEG NOT
%left COLON
%nonassoc UMINUS
%type <K3.AST.expr_t> expr
%type <K3.AST.program_test_t> expression_test
%type <K3.AST.program_t> program
......
......@@ -214,27 +214,27 @@ let predicate_of_expression (info:info) (e:expression): expression =
%token <int> UIDENTIFIER
%token UMINUS
%token USCORE
%nonassoc KWghost LOWEST_PREC
%nonassoc ASSIGN
%nonassoc KWall KWsome
%right SEMICOL
%right ARROW
%right COMMA
%left COLON
%right DARROW
%left KWand KWor
%nonassoc EQ EQV GE GT KWas KWin LE LT NEQ NEQV NOTIN
%left BAR DBAR
%left MINUS PLUS
%left DIVIDE TIMES
%right CARET DCOLON
%left OPERATOR
%right ROPERATOR
%nonassoc KWnot KWold QMARK
%left DOT
%nonassoc LBRACE LBRACKET LPAREN
%nonassoc UMINUS
%nonassoc HIGHEST_PREC KWdeferred
%nonassoc KWghost LOWEST_PREC
%nonassoc ASSIGN
%nonassoc KWall KWsome
%right SEMICOL
%right ARROW
%right COMMA
%left COLON
%right DARROW
%left KWand KWor
%nonassoc EQ EQV GE GT KWas KWin LE LT NEQ NEQV NOTIN
%left BAR DBAR
%left MINUS PLUS
%left DIVIDE TIMES
%right CARET DCOLON
%left OPERATOR
%right ROPERATOR
%nonassoc KWnot KWold QMARK
%left DOT
%nonassoc LBRACE LBRACKET LPAREN
%nonassoc UMINUS
%nonassoc HIGHEST_PREC KWdeferred
%type <Support.module_declaration> file
%type <Support.use_block> use_block_opt
%%
......
......@@ -10,7 +10,7 @@ open Syntax.Raw
%token FAIL
%token PLUS
%token <string> VAR
%left PLUS
%left PLUS
%type <Syntax.Raw.declarations> declarations
%%
......
......@@ -30,7 +30,6 @@ open Mm.Raw
%token RSQUARE
%token VAL
%token WILDCARD
%type <Mm.Raw.expression> toplevel
%%
......
......@@ -27,7 +27,6 @@ open Fsub.Raw
%token TTOP
%token <string> UCID
%token USCORE
%type <Fsub.Raw.toplevel> toplevel
%%
......
......@@ -51,7 +51,6 @@ open Syntax
%token TYPE
%token <Lexing.position * Lexing.position * string> UID
%token WITH
%type <string * Syntax.declaration list> phrase
%%
......
......@@ -155,43 +155,43 @@ let rec ty_app ts t =
%token TYPEQ
%token UNDERSCORE
%token USE
%right DOT
%left INFIXL1
%right INFIXR1
%nonassoc INFIXN1
%right ARROW DARROW
%left LARROW
%nonassoc SLASH
%nonassoc BAR
%left INFIXL2
%right INFIXR2
%nonassoc INFIXN2
%right SEMI
%left INFIXL3
%right INFIXR3
%nonassoc INFIXN3
%right COMMA
%left INFIXL4
%right INFIXR4
%nonassoc INFIXN4
%nonassoc EQ HASH IS
%left INFIXL5
%right INFIXR5
%nonassoc INFIXN5
%left INFIXL6
%right INFIXR6
%nonassoc INFIXN6
%right CONS
%left INFIXL7
%right INFIXR7
%nonassoc INFIXN7
%left INFIXL8
%right INFIXR8
%nonassoc INFIXN8
%left INFIXL9
%right INFIXR9
%nonassoc INFIXN9
%right BACKSLASH
%right DOT
%left INFIXL1
%right INFIXR1
%nonassoc INFIXN1
%right ARROW DARROW
%left LARROW
%nonassoc SLASH
%nonassoc BAR
%left INFIXL2
%right INFIXR2
%nonassoc INFIXN2
%right SEMI
%left INFIXL3
%right INFIXR3
%nonassoc INFIXN3
%right COMMA
%left INFIXL4
%right INFIXR4
%nonassoc INFIXN4
%nonassoc EQ HASH IS
%left INFIXL5
%right INFIXR5
%nonassoc INFIXN5
%left INFIXL6
%right INFIXR6
%nonassoc INFIXN6
%right CONS
%left INFIXL7
%right INFIXR7
%nonassoc INFIXN7
%left INFIXL8
%right INFIXR8
%nonassoc INFIXN8
%left INFIXL9
%right INFIXR9
%nonassoc INFIXN9
%right BACKSLASH
%type <Absyn.decl list> parse
%type <Absyn.decl list> parse_input_line
%%
......
......@@ -28,7 +28,6 @@
%token Lsemi
%token <Io_types.pos * string> Lstring
%token <Io_types.pos> Lvariable
%type <Io_types.io_ast> parse_io_module
%%
......
......@@ -6,7 +6,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token <int> C
%token <int> D
%token <int> EOF
%type <int> phrase
%%
......
......@@ -8,7 +8,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token <int> C
%token <int> D
%token <int> EOF
%type <unit> other
%type <(int, int) either> phrase
%%
......
......@@ -7,7 +7,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token <int> C
%token <int> D
%token <int> EOF
%type <(int, int) either> phrase
%%
......
......@@ -6,7 +6,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token <int> C
%token <int> D
%token <int> EOF
%type <int list> phrase
%%
......
......@@ -31,7 +31,6 @@
%token TILDE
%token TYPE
%token < string > UIDENT
%type < Atd_ast.full_module > full_module
%%
......
......@@ -109,7 +109,7 @@ let rec addbinders tyT l = match l with
%token <string Support.Error.withinfo> UCID
%token <Support.Error.info> USCORE
%token <Support.Error.info> VBAR
%right COMMA
%right COMMA
%type < Syntax.context -> (Syntax.command list * Syntax.context) > toplevel
%%
......
......@@ -88,11 +88,11 @@ let seq e1 e2 =
%token UNIT
%token WILD
%token WITH
%left EQUAL INFIXOP0
%right INFIXOP1
%left INFIXOP2
%left INFIXOP3
%right INFIXOP4
%left EQUAL INFIXOP0
%right INFIXOP1
%left INFIXOP2
%left INFIXOP3
%right INFIXOP4
%type <MiniPrimitives.t Sig.binding list> program
%%
......
......@@ -12,7 +12,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token LPARENT
%token RPARENT
%token <string> VARIABLE
%type <Prolog.clause list> clauses
%%
......
......@@ -4,8 +4,8 @@
%token EOF
%token LOG
%token SIZE
%nonassoc BANG
%nonassoc below_NUM
%nonassoc BANG
%nonassoc below_NUM
%type <unit> desc
%%
......
......@@ -19,7 +19,6 @@ Warning: the token Tlbrace is unused.
%token Trbrace
%token Tsharp
%token <string> Tstring
%type <Bibtex.command> command
%type <Bibtex.biblio> command_list
%%
......
......@@ -2,7 +2,6 @@
%token COLON
%token COMMA
%token ID
%type <unit> def
%%
......
......@@ -7,7 +7,6 @@ open Ast
%token DOT
%token <string> LIDENT
%token SEP
%type <unit> debut
%%
......
......@@ -113,31 +113,31 @@ let rev_combine_list = function
%token <Id.t With.Loc.t> UIDENT
%token <Location.t> VAR
%token <Location.t> WITH
%right prec_stmt
%nonassoc prec_constr_decl prec_mutual_def prec_simple_expr
%nonassoc AND
%right NL SEMI
%right DOL
%right LARROW
%left RARROW
%nonassoc prec_pattern
%nonassoc AS
%left EQUAL GREATER GREATER_EQUAL LESS LESS_EQUAL LESS_GREATER
%right LAND
%right LOR
%right UARROW
%nonassoc prec_pattern_constr_name
%right CONS
%left MINUS MINUS_DOT PLUS PLUS_DOT
%left AST AST_DOT MOD SLASH SLASH_DOT
%right prec_unary_minus
%left prec_app
%left DOT
%right UIDENT
%nonassoc ASSIGN ATOM BOOL CHAR DO EXCL FLOAT IDENT INT LESS_LESS STRING
%left LBRACE LBRACK LPAREN
%nonassoc prec_type_expr_tuple
%nonassoc RPAREN
%right prec_stmt
%nonassoc prec_constr_decl prec_mutual_def prec_simple_expr
%nonassoc AND
%right NL SEMI
%right DOL
%right LARROW
%left RARROW
%nonassoc prec_pattern
%nonassoc AS
%left EQUAL GREATER GREATER_EQUAL LESS LESS_EQUAL LESS_GREATER
%right LAND
%right LOR
%right UARROW
%nonassoc prec_pattern_constr_name
%right CONS
%left MINUS MINUS_DOT PLUS PLUS_DOT
%left AST AST_DOT MOD SLASH SLASH_DOT
%right prec_unary_minus
%left prec_app
%left DOT
%right UIDENT
%nonassoc ASSIGN ATOM BOOL CHAR DO EXCL FLOAT IDENT INT LESS_LESS STRING
%left LBRACE LBRACK LPAREN
%nonassoc prec_type_expr_tuple
%nonassoc RPAREN
%type <Ast_t.def list> prog
%%
......
......@@ -81,7 +81,6 @@
%token VOLATILE
%token WHILE
%token XOR_ASSIGN
%type <unit> translation_unit
%%
......
......@@ -82,7 +82,6 @@
%token VOLATILE
%token WHILE
%token XOR_ASSIGN
%type <unit> translation_unit_file
%%
......
......@@ -9,9 +9,9 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token PLUS
%token RPAREN
%token TIMES
%left MINUS PLUS
%left DIV TIMES
%nonassoc UMINUS
%left MINUS PLUS
%left DIV TIMES
%nonassoc UMINUS
%type <int> main
%%
......
......@@ -7,9 +7,9 @@
%token PLUS
%token RPAREN
%token TIMES
%left MINUS PLUS
%left DIV TIMES
%nonassoc UMINUS
%left MINUS PLUS
%left DIV TIMES
%nonassoc UMINUS
%type <int> main
%%
......
......@@ -7,9 +7,9 @@
%token PLUS
%token RPAREN
%token TIMES
%left MINUS PLUS
%left DIV TIMES
%nonassoc UMINUS
%left MINUS PLUS
%left DIV TIMES
%nonassoc UMINUS
%type <int> main
%%
......
......@@ -116,7 +116,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token VideotexString
%token VisibleString
%token WITH
%type <unit> main
%%
......
......@@ -223,7 +223,6 @@ Warning: the token String_raw is unused.
%token < string > String_extended_raw
%token < string > String_raw
%token < string > Typedef_ident
%type < unit > nothing
%type < Ctypes.declaration list > translation_unit
%%
......
......@@ -269,26 +269,26 @@ let trd3 (_, _, result) = result
%token <Cabs.cabsloc> VOID
%token <Cabs.cabsloc> VOLATILE
%token <Cabs.cabsloc> WHILE
%nonassoc IF
%nonassoc ELSE
%left COMMA
%right AND_EQ CIRC_EQ EQ INF_INF_EQ MINUS_EQ PERCENT_EQ PIPE_EQ PLUS_EQ SLASH_EQ STAR_EQ SUP_SUP_EQ
%right COLON QUEST
%left PIPE_PIPE
%left AND_AND
%left PIPE
%left CIRC
%left AND
%left EQ_EQ EXCLAM_EQ
%left INF INF_EQ SUP SUP_EQ
%left INF_INF SUP_SUP
%left MINUS PLUS
%left CONST PERCENT RESTRICT SLASH STAR VOLATILE
%right ADDROF ALIGNOF CAST EXCLAM MINUS_MINUS PLUS_PLUS RPAREN SIZEOF TILDE
%left LBRACKET
%left ARROW DOT LBRACE LPAREN
%right NAMED_TYPE
%left IDENT
%nonassoc IF
%nonassoc ELSE
%left COMMA
%right AND_EQ CIRC_EQ EQ INF_INF_EQ MINUS_EQ PERCENT_EQ PIPE_EQ PLUS_EQ SLASH_EQ STAR_EQ SUP_SUP_EQ
%right COLON QUEST
%left PIPE_PIPE
%left AND_AND
%left PIPE
%left CIRC
%left AND
%left EQ_EQ EXCLAM_EQ
%left INF INF_EQ SUP SUP_EQ
%left INF_INF SUP_SUP
%left MINUS PLUS
%left CONST PERCENT RESTRICT SLASH STAR VOLATILE
%right ADDROF ALIGNOF CAST EXCLAM MINUS_MINUS PLUS_PLUS RPAREN SIZEOF TILDE
%left LBRACKET
%left ARROW DOT LBRACE LPAREN
%right NAMED_TYPE
%left IDENT
%type <Cabs.decl_type> abs_direct_decl
%type <Cabs.decl_type> abs_direct_decl_opt
%type <Cabs.decl_type * Cabs.attribute list> abstract_decl
......
......@@ -410,27 +410,27 @@ type maybeInit =
%token VOID
%token VOLATILE
%token WHILE
%nonassoc IF
%nonassoc ELSE
%left COMMA
%nonassoc ARG_I ARG_d ARG_e ARG_g ARG_i ARG_l ARG_lo ARG_v
%right AND_EQ CIRC_EQ EQ INF_INF_EQ MINUS_EQ PERCENT_EQ PIPE_EQ PLUS_EQ SLASH_EQ STAR_EQ SUP_SUP_EQ
%right COLON
%left PIPE_PIPE
%left AND_AND
%left ARG_b
%left PIPE
%left CIRC
%left AND
%left EQ_EQ EXCLAM_EQ
%left INF INF_EQ SUP SUP_EQ
%left INF_INF SUP_SUP
%left MINUS PLUS
%left CONST PERCENT RESTRICT SLASH STAR VOLATILE
%right ADDROF ALIGNOF ARG_u CAST EXCLAM MINUS_MINUS PLUS_PLUS RPAREN SIZEOF TILDE
%left LBRACKET
%left ARROW DOT LBRACE LPAREN
%nonassoc CST_INT IDENT QUEST
%nonassoc IF
%nonassoc ELSE
%left COMMA
%nonassoc ARG_I ARG_d ARG_e ARG_g ARG_i ARG_l ARG_lo ARG_v
%right AND_EQ CIRC_EQ EQ INF_INF_EQ MINUS_EQ PERCENT_EQ PIPE_EQ PLUS_EQ SLASH_EQ STAR_EQ SUP_SUP_EQ
%right COLON
%left PIPE_PIPE
%left AND_AND
%left ARG_b
%left PIPE
%left CIRC
%left AND
%left EQ_EQ EXCLAM_EQ
%left INF INF_EQ SUP SUP_EQ
%left INF_INF SUP_SUP
%left MINUS PLUS
%left CONST PERCENT RESTRICT SLASH STAR VOLATILE
%right ADDROF ALIGNOF ARG_u CAST EXCLAM MINUS_MINUS PLUS_PLUS RPAREN SIZEOF TILDE
%left LBRACKET
%left ARROW DOT LBRACE LPAREN
%nonassoc CST_INT IDENT QUEST
%type <((string * Cil.formatArg) list -> Cil.exp) * (Cil.exp -> Cil.formatArg list option)> constant
%type <((string * Cil.formatArg) list -> Cil.exp) * (Cil.exp -> Cil.formatArg list option)> expression
%type <(Cil.location -> (string * Cil.formatArg) list -> Cil.instr) * (Cil.instr -> Cil.formatArg list option)> instr
......
......@@ -25,7 +25,6 @@
%token SORT
%token TERM
%token THEORY
%type <string> search
%type <string Gen_terms.term> term_oe
%type <string * (string list * int) list * (string * string Gen_terms.term * string Gen_terms.term) list> theory_oe
......
......@@ -43,10 +43,10 @@
%token PLUS
%token SEMICOLON
%token <string> VAR
%left MINUS PLUS
%left MULT
%nonassoc UMINUS
%right EXP
%left MINUS PLUS
%left MULT
%nonassoc UMINUS
%right EXP
%type <Generic_polynomials.GenericPolynomials.poly> gen_poly_entry
%type <(User_signatures.symbol_id Marked_dp_criteria.dupl, Poly_interp.IntPolynomials.poly) Signatures.SymbolMap.t > poly_interp_entry
%%
......
......@@ -17,7 +17,6 @@
%token POWER
%token RPAR
%token SEMICOLON
%type <Parameterized_signatures_syntax.constrained_word> cword_eof
%type <Parameterized_signatures_syntax.rules> rules_eof
%type <Parameterized_signatures_syntax.signature> signature_eof
......
......@@ -35,10 +35,10 @@ Warning: the token RIGHT_BRA is unused.
%token RIGHT_PAR
%token SEMICOLON
%token <string> VAR
%left MINUS PLUS
%left MULT
%nonassoc UMINUS
%right EXP
%left MINUS PLUS
%left MULT
%nonassoc UMINUS
%right EXP
%type <(User_signatures.symbol_id, Poly_interp.IntPolynomials.poly) Signatures.SymbolMap.t > poly_interp_entry
%type <(User_signatures.symbol_id, int) Signatures.SymbolMap.t > weight_entry
%%
......
......@@ -30,15 +30,15 @@ Warning: the token SEMICOLON is unused.
%token SEMICOLON
%token TRUE
%token VERTICALBAR
%nonassoc EXISTS FORALL
%right EQUIV IMPLIES
%left OR
%left AND
%nonassoc NOT
%left MINUS PLUS
%left DIV MULT
%nonassoc UMINUS
%right EXP
%nonassoc EXISTS FORALL
%right EQUIV IMPLIES
%left OR
%left AND
%nonassoc NOT
%left MINUS PLUS
%left DIV MULT
%nonassoc UMINUS
%right EXP
%type <Abstract_constraint.formula> constraint_entry
%type <Abstract_constraint.expr> expr
%%
......
......@@ -19,7 +19,6 @@
%token KW_PREFIX
%token KW_UNARY
%token SEMICOLON
%type <(string list * int * Symbols.fix_type * C_declare_operator.symbol_type) list> signature
%%
......
......@@ -107,12 +107,12 @@ let monome_de_variable var =
%token UNIFIER
%token VIRGULE
%token WITH
%left INFIX_IDENT TERMLIST
%nonassoc PARDROITE
%left MINUS PLUS
%left MULT
%nonassoc UMINUS
%right EXP
%left INFIX_IDENT TERMLIST
%nonassoc PARDROITE