Commit b0a8ac1c authored by POTTIER Francois's avatar POTTIER Francois

Re-generated expected output.

parent 89688585
......@@ -94,143 +94,143 @@ let string_of_constant c =
%}
%start program
%token <Annotation.t> XMLwhitespace
%token <Annotation.t * string> XMLtext
%token <Annotation.t> XMLtag_close
%token <Annotation.t * string> XMLtag_chars
%token <Annotation.t * string> XMLpi
%token <Annotation.t> XMLotag_open
%token <Annotation.t> XMLempty_tag_close
%token <Annotation.t> XMLctag_open
%token <Annotation.t * string> XMLcomment
%token <Annotation.t * string> XMLcdata
%token <Annotation.t * string> XMLattr_val
%token <Annotation.t> XMLassign
%token <Annotation.t> Lxorassign
%token <Annotation.t> Lxor
%token <Annotation.t> Lwhitespace
%token <Annotation.t> Ltrue
%token <Annotation.t> Ltilde
%token <Annotation.t * string> Lstring
%token <Annotation.t> Lstarassign
%token <Annotation.t> Lstar
%token <Annotation.t> Lslashassign
%token <Annotation.t> Lslash
%token <Annotation.t> Lsemicolon
%token <Annotation.t> Lsc_or
%token <Annotation.t> Lsc_and
%token <Annotation.t> Lrunsignedshiftassign
%token <Annotation.t> Lrunsignedshift
%token <Annotation.t> Lrsignedshiftassign
%token <Annotation.t> Lrsignedshift
%token <Annotation.t> Lrparen
%token <Annotation.t> Lremassign
%token <Annotation.t> Lrem
%token <Annotation.t * string * string> Lregexp
%token <Annotation.t> Lrbracket
%token <Annotation.t> Lrbrace
%token <Annotation.t> Lplusassign
%token <Annotation.t> Lplus
%token <Annotation.t> Lorassign
%token <Annotation.t> Lnull
%token <Annotation.t> Lneq
%token <Annotation.t> Lne
%token <Annotation.t> Lminusassign
%token <Annotation.t> Lminus
%token <Annotation.t> Llshiftassign
%token <Annotation.t> Llshift
%token <Annotation.t> Llparen
%token <Annotation.t> Lline_terminator
%token <Annotation.t> Lless
%token <Annotation.t> Lle
%token <Annotation.t> Llbracket
%token <Annotation.t> Llbrace
%token <Annotation.t * int> Lint
%token <Annotation.t> Lincr
%token <Annotation.t * string> Lident
%token <Annotation.t> Lhook
%token <Annotation.t> Lgreater
%token <Annotation.t> Lge
%token <Annotation.t * float> Lfloat
%token <Annotation.t> Lfalse
%token <Annotation.t> Leqq
%token <Annotation.t> Leq
%token <Annotation.t> Leof
%token <Annotation.t> Ldot
%token <Annotation.t> Ldecr
%token <Annotation.t> Lddot
%token <Annotation.t> Ldcolon
%token <Annotation.t * string> Lcomment
%token <Annotation.t> Lcomma
%token <Annotation.t> Lcolon
%token <Annotation.t * char> Lchar
%token <Annotation.t> Lbit_or
%token <Annotation.t> Lbit_and
%token <Annotation.t> Lbang
%token <Annotation.t> Lat
%token <Annotation.t> Lassign
%token <Annotation.t> Landassign
%token <Annotation.t> LInitEnd
%token <Annotation.t> LInitBegin
%token <Annotation.t * string> LDcomment
%token <Annotation.t * string> LCcomment
%token <Annotation.t> KWwith
%token <Annotation.t> KWwhile
%token <Annotation.t> KWvoid
%token <Annotation.t> KWvar
%token <Annotation.t> KWtypeof
%token <Annotation.t> KWtry
%token <Annotation.t> KWthrow
%token <Annotation.t> KWthis
%token <Annotation.t> KWswitch
%token <Annotation.t> KWreturn
%token <Annotation.t> KWnew
%token <Annotation.t> KWinstanceof
%token <Annotation.t> KWin
%token <Annotation.t> KWif
%token <Annotation.t> KWfunction
%token <Annotation.t> KWfor
%token <Annotation.t> KWfinally
%token <Annotation.t> KWelse
%token <Annotation.t> KWdo
%token <Annotation.t> KWdelete
%token <Annotation.t> KWdefault
%token <Annotation.t> KWcontinue
%token <Annotation.t> KWcatch
%token <Annotation.t> KWcase
%token <Annotation.t> KWbreak
%token <Annotation.t> FRWvolatile
%token <Annotation.t> FRWtransient
%token <Annotation.t> FRWthrows
%token <Annotation.t> FRWsynchronized
%token <Annotation.t> FRWsuper
%token <Annotation.t> FRWstatic
%token <Annotation.t> FRWshort
%token <Annotation.t> FRWprotected
%token <Annotation.t> FRWprivate
%token <Annotation.t> FRWpackage
%token <Annotation.t> FRWnative
%token <Annotation.t> FRWlong
%token <Annotation.t> FRWinterface
%token <Annotation.t> FRWint
%token <Annotation.t> FRWimplements
%token <Annotation.t> FRWgoto
%token <Annotation.t> FRWfloat
%token <Annotation.t> FRWfinal
%token <Annotation.t> FRWextends
%token <Annotation.t> FRWexport
%token <Annotation.t> FRWenum
%token <Annotation.t> FRWdebugger
%token <Annotation.t> FRWconst
%token <Annotation.t> FRWclass
%token <Annotation.t> FRWchar
%token <Annotation.t> FRWbyte
%token <Annotation.t> FRWboolean
%token <Annotation.t> FRWabstract
%token <Annotation.t> CKWxml
%token <Annotation.t> CKWnamespace
%token <Annotation.t> CKWeach
%token <Annotation.t> CKWdefaultxmlnamespace
%token <Annotation.t> CKWeach
%token <Annotation.t> CKWnamespace
%token <Annotation.t> CKWxml
%token <Annotation.t> FRWabstract
%token <Annotation.t> FRWboolean
%token <Annotation.t> FRWbyte
%token <Annotation.t> FRWchar
%token <Annotation.t> FRWclass
%token <Annotation.t> FRWconst
%token <Annotation.t> FRWdebugger
%token <Annotation.t> FRWenum
%token <Annotation.t> FRWexport
%token <Annotation.t> FRWextends
%token <Annotation.t> FRWfinal
%token <Annotation.t> FRWfloat
%token <Annotation.t> FRWgoto
%token <Annotation.t> FRWimplements
%token <Annotation.t> FRWint
%token <Annotation.t> FRWinterface
%token <Annotation.t> FRWlong
%token <Annotation.t> FRWnative
%token <Annotation.t> FRWpackage
%token <Annotation.t> FRWprivate
%token <Annotation.t> FRWprotected
%token <Annotation.t> FRWshort
%token <Annotation.t> FRWstatic
%token <Annotation.t> FRWsuper
%token <Annotation.t> FRWsynchronized
%token <Annotation.t> FRWthrows
%token <Annotation.t> FRWtransient
%token <Annotation.t> FRWvolatile
%token <Annotation.t> KWbreak
%token <Annotation.t> KWcase
%token <Annotation.t> KWcatch
%token <Annotation.t> KWcontinue
%token <Annotation.t> KWdefault
%token <Annotation.t> KWdelete
%token <Annotation.t> KWdo
%token <Annotation.t> KWelse
%token <Annotation.t> KWfinally
%token <Annotation.t> KWfor
%token <Annotation.t> KWfunction
%token <Annotation.t> KWif
%token <Annotation.t> KWin
%token <Annotation.t> KWinstanceof
%token <Annotation.t> KWnew
%token <Annotation.t> KWreturn
%token <Annotation.t> KWswitch
%token <Annotation.t> KWthis
%token <Annotation.t> KWthrow
%token <Annotation.t> KWtry
%token <Annotation.t> KWtypeof
%token <Annotation.t> KWvar
%token <Annotation.t> KWvoid
%token <Annotation.t> KWwhile
%token <Annotation.t> KWwith
%token <Annotation.t * string> LCcomment
%token <Annotation.t * string> LDcomment
%token <Annotation.t> LInitBegin
%token <Annotation.t> LInitEnd
%token <Annotation.t> Landassign
%token <Annotation.t> Lassign
%token <Annotation.t> Lat
%token <Annotation.t> Lbang
%token <Annotation.t> Lbit_and
%token <Annotation.t> Lbit_or
%token <Annotation.t * char> Lchar
%token <Annotation.t> Lcolon
%token <Annotation.t> Lcomma
%token <Annotation.t * string> Lcomment
%token <Annotation.t> Ldcolon
%token <Annotation.t> Lddot
%token <Annotation.t> Ldecr
%token <Annotation.t> Ldot
%token <Annotation.t> Leof
%token <Annotation.t> Leq
%token <Annotation.t> Leqq
%token <Annotation.t> Lfalse
%token <Annotation.t * float> Lfloat
%token <Annotation.t> Lge
%token <Annotation.t> Lgreater
%token <Annotation.t> Lhook
%token <Annotation.t * string> Lident
%token <Annotation.t> Lincr
%token <Annotation.t * int> Lint
%token <Annotation.t> Llbrace
%token <Annotation.t> Llbracket
%token <Annotation.t> Lle
%token <Annotation.t> Lless
%token <Annotation.t> Lline_terminator
%token <Annotation.t> Llparen
%token <Annotation.t> Llshift
%token <Annotation.t> Llshiftassign
%token <Annotation.t> Lminus
%token <Annotation.t> Lminusassign
%token <Annotation.t> Lne
%token <Annotation.t> Lneq
%token <Annotation.t> Lnull
%token <Annotation.t> Lorassign
%token <Annotation.t> Lplus
%token <Annotation.t> Lplusassign
%token <Annotation.t> Lrbrace
%token <Annotation.t> Lrbracket
%token <Annotation.t * string * string> Lregexp
%token <Annotation.t> Lrem
%token <Annotation.t> Lremassign
%token <Annotation.t> Lrparen
%token <Annotation.t> Lrsignedshift
%token <Annotation.t> Lrsignedshiftassign
%token <Annotation.t> Lrunsignedshift
%token <Annotation.t> Lrunsignedshiftassign
%token <Annotation.t> Lsc_and
%token <Annotation.t> Lsc_or
%token <Annotation.t> Lsemicolon
%token <Annotation.t> Lslash
%token <Annotation.t> Lslashassign
%token <Annotation.t> Lstar
%token <Annotation.t> Lstarassign
%token <Annotation.t * string> Lstring
%token <Annotation.t> Ltilde
%token <Annotation.t> Ltrue
%token <Annotation.t> Lwhitespace
%token <Annotation.t> Lxor
%token <Annotation.t> Lxorassign
%token <Annotation.t> XMLassign
%token <Annotation.t * string> XMLattr_val
%token <Annotation.t * string> XMLcdata
%token <Annotation.t * string> XMLcomment
%token <Annotation.t> XMLctag_open
%token <Annotation.t> XMLempty_tag_close
%token <Annotation.t> XMLotag_open
%token <Annotation.t * string> XMLpi
%token <Annotation.t * string> XMLtag_chars
%token <Annotation.t> XMLtag_close
%token <Annotation.t * string> XMLtext
%token <Annotation.t> XMLwhitespace
%type <string AST.program> program
%%
......
......@@ -113,138 +113,138 @@ Warning: symbol integer_list is unreachable from any of the start symbol(s).
%start expression_test
%start program
%start program_test
%token UPSERT_WITH_BEFORE
%token UPSERT_WITH
%token UPDATE_SUFFIX
%token UPDATE
%token UNKNOWN
%token UNIT
%token <K3.AST.base_type_t> TYPE
%token TRIGGER
%token TOP
%token <string> STRING
%token STREAM
%token SOURCE
%token SORT
%token SOCKET
%token SIZE
%token SINK
%token SEND
%token SEMICOLON
%token RPAREN
%token ROLE
%token RBRACKETLT
%token RBRACKETHASH
%token RBRACKETCOLON
%token RBRACKETBAR
%token RBRACKET
%token RBRACELT
%token RBRACECOLON
%token RBRACEBAR
%token RBRACE
%token RANK
%token RANGE
%token RANDOM
%token QUESTION
%token PERIOD
%token PEEK_WITH_VID
%token PEEK
%token PATTERN
%token PARALLEL
%token NOTHING
%token NETWORK
%token MUT
%token MIN_WITH
%token MAYBE
%token MAP
%token LPAREN
%token LET
%token LBRACKETLT
%token LBRACKETHASH
%token LBRACKETGEQ
%token LBRACKETCOLON
%token LBRACKETBAR
%token LBRACKET
%token LBRACELT
%token LBRACECOLON
%token LBRACEBAR
%token LBRACE
%token LARROW
%token JUST
%token ITERATE
%token <string> IP
%token <int> INTEGER
%token INSERT
%token INDIRECT
%token IN
%token IGNORE
%token <string> IDENTIFIER
%token HASH
%token GROUPBYAGGREGATE
%token GETS
%token FOREIGN
%token <float> FLOAT
%token FLATTEN
%token FILTERGEQ
%token FILTER
%token FILE
%token EXPECTED
%token EOF
%token EFFECT
%token DO
%token DELETE_PREFIX
%token DELETE
%token DEFAULT
%token DECLARE
%token CONSUME
%token COMMA
%token COLONGETS
%token <bool> BOOL
%token BINDFLOW
%token BIND
%token BAR
%token BACKSLASH
%token AT_WITH
%token AS
%token AGGREGATEV
%token AGGREGATE
%token RARROW
%token LRARROW
%token THEN
%token IF
%token ELSE
%token OF
%token AGGREGATEV
%token AND
%token ANNOTATE
%token AS
%token AT_WITH
%token BACKSLASH
%token BAR
%token BIND
%token BINDFLOW
%token <bool> BOOL
%token CASE
%token COLON
%token COLONGETS
%token COMMA
%token CONCAT
%token OR
%token AND
%token NEQ
%token LT
%token LEQ
%token GT
%token GEQ
%token CONSUME
%token DECLARE
%token DEFAULT
%token DELETE
%token DELETE_PREFIX
%token DIVIDE
%token DO
%token EFFECT
%token ELSE
%token EOF
%token EQ
%token PLUS
%token EXPECTED
%token FILE
%token FILTER
%token FILTERGEQ
%token FLATTEN
%token <float> FLOAT
%token FOREIGN
%token GEQ
%token GETS
%token GROUPBYAGGREGATE
%token GT
%token HASH
%token <string> IDENTIFIER
%token IF
%token IGNORE
%token IN
%token INDIRECT
%token INSERT
%token <int> INTEGER
%token <string> IP
%token ITERATE
%token JUST
%token LARROW
%token LBRACE
%token LBRACEBAR
%token LBRACECOLON
%token LBRACELT
%token LBRACKET
%token LBRACKETBAR
%token LBRACKETCOLON
%token LBRACKETGEQ
%token LBRACKETHASH
%token LBRACKETLT
%token LEQ
%token LET
%token LPAREN
%token LRARROW
%token LT
%token MAP
%token MAYBE
%token MINUS
%token TIMES
%token MIN_WITH
%token MODULO
%token DIVIDE
%token ANNOTATE
%token NOT
%token MUT
%token NEG
%token COLON
%token NEQ
%token NETWORK
%token NOT
%token NOTHING
%token OF
%token OR
%token PARALLEL
%token PATTERN
%token PEEK
%token PEEK_WITH_VID
%token PERIOD
%token PLUS
%token QUESTION
%token RANDOM
%token RANGE
%token RANK
%token RARROW
%token RBRACE
%token RBRACEBAR
%token RBRACECOLON
%token RBRACELT
%token RBRACKET
%token RBRACKETBAR
%token RBRACKETCOLON
%token RBRACKETHASH
%token RBRACKETLT
%token ROLE
%token RPAREN
%token SEMICOLON
%token SEND
%token SINK
%token SIZE
%token SOCKET
%token SORT
%token SOURCE
%token STREAM
%token <string> STRING
%token THEN
%token TIMES
%token TOP
%token TRIGGER
%token <K3.AST.base_type_t> TYPE
%token UNIT
%token UNKNOWN
%token UPDATE
%token UPDATE_SUFFIX
%token UPSERT_WITH
%token UPSERT_WITH_BEFORE
%right RARROW
%right LRARROW
%right THEN IF ELSE
%right OF CASE
%right ELSE IF THEN
%right CASE OF
%right CONCAT
%left OR
%left AND
%left NEQ LT LEQ GT GEQ EQ
%left PLUS MINUS
%left TIMES MODULO DIVIDE
%left EQ GEQ GT LEQ LT NEQ
%left MINUS PLUS
%left DIVIDE MODULO TIMES
%left ANNOTATE
%right NOT NEG
%right NEG NOT
%left COLON
%nonassoc UMINUS
%type <K3.AST.expr_t> expr
......
......@@ -121,120 +121,120 @@ let predicate_of_expression (info:info) (e:expression): expression =
%}
%start file
%start use_block_opt
%token USCORE
%token <int> UIDENTIFIER
%token RPAREN
%token RBRACKET
%token RBRACE
%token PARENOP
%token <int> NUMBER
%token NEWLINE
%token <int> LIDENTIFIER
%token KWwhile
%token KWvariant
%token KWuse
%token KWundefine
%token KWtrue
%token KWthen
%token KWrequire
%token KWrename
%token KWredefine
%token KWproof
%token KWnote
%token KWlocal
%token KWinvariant
%token KWinspect
%token KWinherit
%token KWimport
%token KWimmutable
%token KWif
%token KWfrom
%token KWfeature
%token KWfalse
%token KWensure
%token KWend
%token KWelseif
%token KWelse
%token KWdo
%token KWcreate
%token KWclass
%token KWcheck
%token KWcase
%token KWassert
%token KWagent
%token KWResult
%token KWProcess
%token KWPrecursor
%token KWNONE
%token KWCurrent
%token KWCURRENT
%token EXCLAM
%token EOF
%token BRACKETOP
%token LOWEST_PREC
%token KWghost
%token ASSIGN
%token KWsome
%token KWall
%token SEMICOL
%token ARROW
%token COMMA
%token ASSIGN
%token BAR
%token BRACKETOP
%token CARET
%token COLON
%token COMMA
%token DARROW
%token KWor
%token DBAR
%token DCOLON
%token DIVIDE
%token DOT
%token EOF
%token EQ
%token EQV
%token EXCLAM
%token GE
%token GT
%token HIGHEST_PREC
%token KWCURRENT
%token KWCurrent
%token KWNONE
%token KWPrecursor
%token KWProcess
%token KWResult
%token KWagent
%token KWall
%token KWand
%token NOTIN
%token NEQV
%token NEQ
%token LT
%token LE
%token KWin
%token KWas
%token GT
%token GE
%token EQV
%token EQ
%token DBAR
%token BAR
%token PLUS
%token KWassert
%token KWcase
%token KWcheck
%token KWclass
%token KWcreate
%token KWdeferred
%token KWdo
%token KWelse
%token KWelseif
%token KWend
%token KWensure
%token KWfalse
%token KWfeature
%token KWfrom
%token KWghost
%token KWif
%token KWimmutable
%token KWimport
%token KWin
%token KWinherit
%token KWinspect
%token KWinvariant
%token KWlocal
%token KWnot
%token KWnote
%token KWold
%token KWor
%token KWproof
%token KWredefine
%token KWrename
%token KWrequire
%token KWsome
%token KWthen