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

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

parent 90ddced9
...@@ -231,7 +231,6 @@ let string_of_constant c = ...@@ -231,7 +231,6 @@ let string_of_constant c =
%token <Annotation.t> XMLtag_close %token <Annotation.t> XMLtag_close
%token <Annotation.t * string> XMLtext %token <Annotation.t * string> XMLtext
%token <Annotation.t> XMLwhitespace %token <Annotation.t> XMLwhitespace
%type <string AST.program> program %type <string AST.program> program
%% %%
......
...@@ -233,20 +233,20 @@ Warning: symbol integer_list is unreachable from any of the start symbol(s). ...@@ -233,20 +233,20 @@ Warning: symbol integer_list is unreachable from any of the start symbol(s).
%token UPDATE_SUFFIX %token UPDATE_SUFFIX
%token UPSERT_WITH %token UPSERT_WITH
%token UPSERT_WITH_BEFORE %token UPSERT_WITH_BEFORE
%right RARROW %right RARROW
%right LRARROW %right LRARROW
%right ELSE IF THEN %right ELSE IF THEN
%right CASE OF %right CASE OF
%right CONCAT %right CONCAT
%left OR %left OR
%left AND %left AND
%left EQ GEQ GT LEQ LT NEQ %left EQ GEQ GT LEQ LT NEQ
%left MINUS PLUS %left MINUS PLUS
%left DIVIDE MODULO TIMES %left DIVIDE MODULO TIMES
%left ANNOTATE %left ANNOTATE
%right NEG NOT %right NEG NOT
%left COLON %left COLON
%nonassoc UMINUS %nonassoc UMINUS
%type <K3.AST.expr_t> expr %type <K3.AST.expr_t> expr
%type <K3.AST.program_test_t> expression_test %type <K3.AST.program_test_t> expression_test
%type <K3.AST.program_t> program %type <K3.AST.program_t> program
......
...@@ -214,27 +214,27 @@ let predicate_of_expression (info:info) (e:expression): expression = ...@@ -214,27 +214,27 @@ let predicate_of_expression (info:info) (e:expression): expression =
%token <int> UIDENTIFIER %token <int> UIDENTIFIER
%token UMINUS %token UMINUS
%token USCORE %token USCORE
%nonassoc KWghost LOWEST_PREC %nonassoc KWghost LOWEST_PREC
%nonassoc ASSIGN %nonassoc ASSIGN
%nonassoc KWall KWsome %nonassoc KWall KWsome
%right SEMICOL %right SEMICOL
%right ARROW %right ARROW
%right COMMA %right COMMA
%left COLON %left COLON
%right DARROW %right DARROW
%left KWand KWor %left KWand KWor
%nonassoc EQ EQV GE GT KWas KWin LE LT NEQ NEQV NOTIN %nonassoc EQ EQV GE GT KWas KWin LE LT NEQ NEQV NOTIN
%left BAR DBAR %left BAR DBAR
%left MINUS PLUS %left MINUS PLUS
%left DIVIDE TIMES %left DIVIDE TIMES
%right CARET DCOLON %right CARET DCOLON
%left OPERATOR %left OPERATOR
%right ROPERATOR %right ROPERATOR
%nonassoc KWnot KWold QMARK %nonassoc KWnot KWold QMARK
%left DOT %left DOT
%nonassoc LBRACE LBRACKET LPAREN %nonassoc LBRACE LBRACKET LPAREN
%nonassoc UMINUS %nonassoc UMINUS
%nonassoc HIGHEST_PREC KWdeferred %nonassoc HIGHEST_PREC KWdeferred
%type <Support.module_declaration> file %type <Support.module_declaration> file
%type <Support.use_block> use_block_opt %type <Support.use_block> use_block_opt
%% %%
......
...@@ -10,7 +10,7 @@ open Syntax.Raw ...@@ -10,7 +10,7 @@ open Syntax.Raw
%token FAIL %token FAIL
%token PLUS %token PLUS
%token <string> VAR %token <string> VAR
%left PLUS %left PLUS
%type <Syntax.Raw.declarations> declarations %type <Syntax.Raw.declarations> declarations
%% %%
......
...@@ -30,7 +30,6 @@ open Mm.Raw ...@@ -30,7 +30,6 @@ open Mm.Raw
%token RSQUARE %token RSQUARE
%token VAL %token VAL
%token WILDCARD %token WILDCARD
%type <Mm.Raw.expression> toplevel %type <Mm.Raw.expression> toplevel
%% %%
......
...@@ -27,7 +27,6 @@ open Fsub.Raw ...@@ -27,7 +27,6 @@ open Fsub.Raw
%token TTOP %token TTOP
%token <string> UCID %token <string> UCID
%token USCORE %token USCORE
%type <Fsub.Raw.toplevel> toplevel %type <Fsub.Raw.toplevel> toplevel
%% %%
......
...@@ -51,7 +51,6 @@ open Syntax ...@@ -51,7 +51,6 @@ open Syntax
%token TYPE %token TYPE
%token <Lexing.position * Lexing.position * string> UID %token <Lexing.position * Lexing.position * string> UID
%token WITH %token WITH
%type <string * Syntax.declaration list> phrase %type <string * Syntax.declaration list> phrase
%% %%
......
...@@ -155,43 +155,43 @@ let rec ty_app ts t = ...@@ -155,43 +155,43 @@ let rec ty_app ts t =
%token TYPEQ %token TYPEQ
%token UNDERSCORE %token UNDERSCORE
%token USE %token USE
%right DOT %right DOT
%left INFIXL1 %left INFIXL1
%right INFIXR1 %right INFIXR1
%nonassoc INFIXN1 %nonassoc INFIXN1
%right ARROW DARROW %right ARROW DARROW
%left LARROW %left LARROW
%nonassoc SLASH %nonassoc SLASH
%nonassoc BAR %nonassoc BAR
%left INFIXL2 %left INFIXL2
%right INFIXR2 %right INFIXR2
%nonassoc INFIXN2 %nonassoc INFIXN2
%right SEMI %right SEMI
%left INFIXL3 %left INFIXL3
%right INFIXR3 %right INFIXR3
%nonassoc INFIXN3 %nonassoc INFIXN3
%right COMMA %right COMMA
%left INFIXL4 %left INFIXL4
%right INFIXR4 %right INFIXR4
%nonassoc INFIXN4 %nonassoc INFIXN4
%nonassoc EQ HASH IS %nonassoc EQ HASH IS
%left INFIXL5 %left INFIXL5
%right INFIXR5 %right INFIXR5
%nonassoc INFIXN5 %nonassoc INFIXN5
%left INFIXL6 %left INFIXL6
%right INFIXR6 %right INFIXR6
%nonassoc INFIXN6 %nonassoc INFIXN6
%right CONS %right CONS
%left INFIXL7 %left INFIXL7
%right INFIXR7 %right INFIXR7
%nonassoc INFIXN7 %nonassoc INFIXN7
%left INFIXL8 %left INFIXL8
%right INFIXR8 %right INFIXR8
%nonassoc INFIXN8 %nonassoc INFIXN8
%left INFIXL9 %left INFIXL9
%right INFIXR9 %right INFIXR9
%nonassoc INFIXN9 %nonassoc INFIXN9
%right BACKSLASH %right BACKSLASH
%type <Absyn.decl list> parse %type <Absyn.decl list> parse
%type <Absyn.decl list> parse_input_line %type <Absyn.decl list> parse_input_line
%% %%
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
%token Lsemi %token Lsemi
%token <Io_types.pos * string> Lstring %token <Io_types.pos * string> Lstring
%token <Io_types.pos> Lvariable %token <Io_types.pos> Lvariable
%type <Io_types.io_ast> parse_io_module %type <Io_types.io_ast> parse_io_module
%% %%
......
...@@ -6,7 +6,6 @@ recommend switching on --infer in order to avoid obscure type error messages. ...@@ -6,7 +6,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token <int> C %token <int> C
%token <int> D %token <int> D
%token <int> EOF %token <int> EOF
%type <int> phrase %type <int> phrase
%% %%
......
...@@ -8,7 +8,6 @@ recommend switching on --infer in order to avoid obscure type error messages. ...@@ -8,7 +8,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token <int> C %token <int> C
%token <int> D %token <int> D
%token <int> EOF %token <int> EOF
%type <unit> other %type <unit> other
%type <(int, int) either> phrase %type <(int, int) either> phrase
%% %%
......
...@@ -7,7 +7,6 @@ recommend switching on --infer in order to avoid obscure type error messages. ...@@ -7,7 +7,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token <int> C %token <int> C
%token <int> D %token <int> D
%token <int> EOF %token <int> EOF
%type <(int, int) either> phrase %type <(int, int) either> phrase
%% %%
......
...@@ -6,7 +6,6 @@ recommend switching on --infer in order to avoid obscure type error messages. ...@@ -6,7 +6,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token <int> C %token <int> C
%token <int> D %token <int> D
%token <int> EOF %token <int> EOF
%type <int list> phrase %type <int list> phrase
%% %%
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
%token TILDE %token TILDE
%token TYPE %token TYPE
%token < string > UIDENT %token < string > UIDENT
%type < Atd_ast.full_module > full_module %type < Atd_ast.full_module > full_module
%% %%
......
...@@ -109,7 +109,7 @@ let rec addbinders tyT l = match l with ...@@ -109,7 +109,7 @@ let rec addbinders tyT l = match l with
%token <string Support.Error.withinfo> UCID %token <string Support.Error.withinfo> UCID
%token <Support.Error.info> USCORE %token <Support.Error.info> USCORE
%token <Support.Error.info> VBAR %token <Support.Error.info> VBAR
%right COMMA %right COMMA
%type < Syntax.context -> (Syntax.command list * Syntax.context) > toplevel %type < Syntax.context -> (Syntax.command list * Syntax.context) > toplevel
%% %%
......
...@@ -88,11 +88,11 @@ let seq e1 e2 = ...@@ -88,11 +88,11 @@ let seq e1 e2 =
%token UNIT %token UNIT
%token WILD %token WILD
%token WITH %token WITH
%left EQUAL INFIXOP0 %left EQUAL INFIXOP0
%right INFIXOP1 %right INFIXOP1
%left INFIXOP2 %left INFIXOP2
%left INFIXOP3 %left INFIXOP3
%right INFIXOP4 %right INFIXOP4
%type <MiniPrimitives.t Sig.binding list> program %type <MiniPrimitives.t Sig.binding list> program
%% %%
......
...@@ -12,7 +12,6 @@ recommend switching on --infer in order to avoid obscure type error messages. ...@@ -12,7 +12,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token LPARENT %token LPARENT
%token RPARENT %token RPARENT
%token <string> VARIABLE %token <string> VARIABLE
%type <Prolog.clause list> clauses %type <Prolog.clause list> clauses
%% %%
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
%token EOF %token EOF
%token LOG %token LOG
%token SIZE %token SIZE
%nonassoc BANG %nonassoc BANG
%nonassoc below_NUM %nonassoc below_NUM
%type <unit> desc %type <unit> desc
%% %%
......
...@@ -19,7 +19,6 @@ Warning: the token Tlbrace is unused. ...@@ -19,7 +19,6 @@ Warning: the token Tlbrace is unused.
%token Trbrace %token Trbrace
%token Tsharp %token Tsharp
%token <string> Tstring %token <string> Tstring
%type <Bibtex.command> command %type <Bibtex.command> command
%type <Bibtex.biblio> command_list %type <Bibtex.biblio> command_list
%% %%
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
%token COLON %token COLON
%token COMMA %token COMMA
%token ID %token ID
%type <unit> def %type <unit> def
%% %%
......
...@@ -7,7 +7,6 @@ open Ast ...@@ -7,7 +7,6 @@ open Ast
%token DOT %token DOT
%token <string> LIDENT %token <string> LIDENT
%token SEP %token SEP
%type <unit> debut %type <unit> debut
%% %%
......
...@@ -113,31 +113,31 @@ let rev_combine_list = function ...@@ -113,31 +113,31 @@ let rev_combine_list = function
%token <Id.t With.Loc.t> UIDENT %token <Id.t With.Loc.t> UIDENT
%token <Location.t> VAR %token <Location.t> VAR
%token <Location.t> WITH %token <Location.t> WITH
%right prec_stmt %right prec_stmt
%nonassoc prec_constr_decl prec_mutual_def prec_simple_expr %nonassoc prec_constr_decl prec_mutual_def prec_simple_expr
%nonassoc AND %nonassoc AND
%right NL SEMI %right NL SEMI
%right DOL %right DOL
%right LARROW %right LARROW
%left RARROW %left RARROW
%nonassoc prec_pattern %nonassoc prec_pattern
%nonassoc AS %nonassoc AS
%left EQUAL GREATER GREATER_EQUAL LESS LESS_EQUAL LESS_GREATER %left EQUAL GREATER GREATER_EQUAL LESS LESS_EQUAL LESS_GREATER
%right LAND %right LAND
%right LOR %right LOR
%right UARROW %right UARROW
%nonassoc prec_pattern_constr_name %nonassoc prec_pattern_constr_name
%right CONS %right CONS
%left MINUS MINUS_DOT PLUS PLUS_DOT %left MINUS MINUS_DOT PLUS PLUS_DOT
%left AST AST_DOT MOD SLASH SLASH_DOT %left AST AST_DOT MOD SLASH SLASH_DOT
%right prec_unary_minus %right prec_unary_minus
%left prec_app %left prec_app
%left DOT %left DOT
%right UIDENT %right UIDENT
%nonassoc ASSIGN ATOM BOOL CHAR DO EXCL FLOAT IDENT INT LESS_LESS STRING %nonassoc ASSIGN ATOM BOOL CHAR DO EXCL FLOAT IDENT INT LESS_LESS STRING
%left LBRACE LBRACK LPAREN %left LBRACE LBRACK LPAREN
%nonassoc prec_type_expr_tuple %nonassoc prec_type_expr_tuple
%nonassoc RPAREN %nonassoc RPAREN
%type <Ast_t.def list> prog %type <Ast_t.def list> prog
%% %%
......
...@@ -81,7 +81,6 @@ ...@@ -81,7 +81,6 @@
%token VOLATILE %token VOLATILE
%token WHILE %token WHILE
%token XOR_ASSIGN %token XOR_ASSIGN
%type <unit> translation_unit %type <unit> translation_unit
%% %%
......
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
%token VOLATILE %token VOLATILE
%token WHILE %token WHILE
%token XOR_ASSIGN %token XOR_ASSIGN
%type <unit> translation_unit_file %type <unit> translation_unit_file
%% %%
......
...@@ -9,9 +9,9 @@ recommend switching on --infer in order to avoid obscure type error messages. ...@@ -9,9 +9,9 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token PLUS %token PLUS
%token RPAREN %token RPAREN
%token TIMES %token TIMES
%left MINUS PLUS %left MINUS PLUS
%left DIV TIMES %left DIV TIMES
%nonassoc UMINUS %nonassoc UMINUS
%type <int> main %type <int> main
%% %%
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
%token PLUS %token PLUS
%token RPAREN %token RPAREN
%token TIMES %token TIMES
%left MINUS PLUS %left MINUS PLUS
%left DIV TIMES %left DIV TIMES
%nonassoc UMINUS %nonassoc UMINUS
%type <int> main %type <int> main
%% %%
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
%token PLUS %token PLUS
%token RPAREN %token RPAREN
%token TIMES %token TIMES
%left MINUS PLUS %left MINUS PLUS
%left DIV TIMES %left DIV TIMES
%nonassoc UMINUS %nonassoc UMINUS
%type <int> main %type <int> main
%% %%
......
...@@ -116,7 +116,6 @@ recommend switching on --infer in order to avoid obscure type error messages. ...@@ -116,7 +116,6 @@ recommend switching on --infer in order to avoid obscure type error messages.
%token VideotexString %token VideotexString
%token VisibleString %token VisibleString
%token WITH %token WITH
%type <unit> main %type <unit> main
%% %%
......
...@@ -223,7 +223,6 @@ Warning: the token String_raw is unused. ...@@ -223,7 +223,6 @@ Warning: the token String_raw is unused.
%token < string > String_extended_raw %token < string > String_extended_raw
%token < string > String_raw %token < string > String_raw
%token < string > Typedef_ident %token < string > Typedef_ident
%type < unit > nothing %type < unit > nothing
%type < Ctypes.declaration list > translation_unit %type < Ctypes.declaration list > translation_unit
%% %%
......
...@@ -269,26 +269,26 @@ let trd3 (_, _, result) = result ...@@ -269,26 +269,26 @@ let trd3 (_, _, result) = result
%token <Cabs.cabsloc> VOID %token <Cabs.cabsloc> VOID
%token <Cabs.cabsloc> VOLATILE %token <Cabs.cabsloc> VOLATILE
%token <Cabs.cabsloc> WHILE %token <Cabs.cabsloc> WHILE
%nonassoc IF %nonassoc IF
%nonassoc ELSE %nonassoc ELSE
%left COMMA %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 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 %right COLON QUEST