Record construction must use longident_field... but more conflicts
This commit is contained in:
parent
a037d4071d
commit
95da29da2f
@ -188,10 +188,19 @@
|
|||||||
(BEGIN END) : (list 'CUnit)
|
(BEGIN END) : (list 'CUnit)
|
||||||
(INT) : (list 'CInt $1))
|
(INT) : (list 'CInt $1))
|
||||||
|
|
||||||
|
(uident_ext
|
||||||
|
(UIDENT) : $1
|
||||||
|
(LBRACK RBRACK) : "[]"
|
||||||
|
(LPAREN COLONCOLON RPAREN) : "::")
|
||||||
|
|
||||||
(longident_uident
|
(longident_uident
|
||||||
(UIDENT) : (list 'Lident $1)
|
(UIDENT) : (list 'Lident $1)
|
||||||
(longident_uident DOT UIDENT) : (list 'Ldot $1 $3))
|
(longident_uident DOT UIDENT) : (list 'Ldot $1 $3))
|
||||||
|
|
||||||
|
(longident_uident_ext
|
||||||
|
(UIDENT) : (list 'Lident $1)
|
||||||
|
(longident_uident DOT UIDENT) : (list 'Ldot $1 $3))
|
||||||
|
|
||||||
(longident_constr
|
(longident_constr
|
||||||
(longident_uident (prec: dot_prec)) : $1)
|
(longident_uident (prec: dot_prec)) : $1)
|
||||||
|
|
||||||
@ -227,8 +236,11 @@
|
|||||||
(SEMICOLON) : '())
|
(SEMICOLON) : '())
|
||||||
|
|
||||||
(record_list_expr
|
(record_list_expr
|
||||||
(longident_lident EQ expr_no_semi) : (cons (cons $1 $3) #nil)
|
(record_item_expr) : (cons $1 #nil)
|
||||||
(record_list_expr SEMICOLON longident_lident EQ expr_no_semi) : (cons (cons $3 $5) $1))
|
(record_list_expr SEMICOLON record_item_expr) : (cons $3 $1))
|
||||||
|
|
||||||
|
(record_item_expr
|
||||||
|
(longident_field EQ expr_no_semi) : (cons $1 $3))
|
||||||
|
|
||||||
(pattern_constr_args
|
(pattern_constr_args
|
||||||
(lident_ext) : (cons $1 #nil)
|
(lident_ext) : (cons $1 #nil)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user