| s1 :: tl1, s2 :: tl2 -> s1 :: join tl1 tl2
in
let rec an_val = function
- | M.Const _ -> []
- | M.VVar _ -> []
- | M.Record (rv, _) -> [rv]
- | M.Fun (_, x) -> an_val x
- | M.Attribute (_, _, x) -> an_val x
- | M.RefOf x -> an_set x
+ | M.Const _ -> []
+ | M.VVar _ -> []
+ | M.Record (rv, _) -> [rv]
+ | M.Fun (_, x) -> an_val x
+ | M.Property (_, _, _, x) -> an_val x
+ | M.RefOf x -> an_set x
and an_boole = function
| M.False -> []
| M.True -> []
- | M.Ex _ _ -> []
+ | M.Ex _ -> []
| M.Not x -> an_boole x
| M.And (x, y) -> join (an_boole x) (an_boole y)
| M.Or (x, y) -> join (an_boole x) (an_boole y)
| M.Meet (x, y) -> join (an_val x) (an_val y)
| M.Eq (x, y) -> join (an_val x) (an_val y)
and an_set = function
- | M.SVar _ -> []
- | M.RVar _ -> []
- | M.Relation (_, _, x, _) -> an_set x
- | M.Pattern x -> an_val x
- | M.Ref x -> an_val x
- | M.Union (x, y) -> join (an_set x) (an_set y)
- | M.Intersect (x, y) -> join (an_set x) (an_set y)
- | M.Diff (x, y) -> join (an_set x) (an_set y)
- | M.LetSVar (_, x, y) -> join (an_set x) (an_set y)
- | M.LetVVar (_, x, y) -> join (an_val x) (an_set y)
- | M.Select (_, x, y) -> join (an_set x) (an_boole y)
+ | M.SVar _ -> []
+ | M.RVar _ -> []
+ | M.Relation (_, _, _, x, _) -> an_set x
+ | M.Pattern x -> an_val x
+ | M.Ref x -> an_val x
+ | M.Union (x, y) -> join (an_set x) (an_set y)
+ | M.Intersect (x, y) -> join (an_set x) (an_set y)
+ | M.Diff (x, y) -> join (an_set x) (an_set y)
+ | M.LetSVar (_, x, y) -> join (an_set x) (an_set y)
+ | M.LetVVar (_, x, y) -> join (an_val x) (an_set y)
+ | M.Select (_, x, y) -> join (an_set x) (an_boole y)
in
an_boole x
+
+ let path_of_vvar v = (v, [])
%}
%token <string> ID STR
- %token SL IS LC RC CM SC LP RP AT PC DL FS DQ EOF
- %token AND ATTR ATTRIB BE DIFF EQ EX FALSE FUN IN INTER LET MEET NOT OR
- %token PAT REF REFOF REL SELECT SUB SUPER TRUE UNION WHERE
+ %token SL IS LC RC CM SC LP RP AT PC DL FS DQ GETS EOF
+ %token AND ATTR BE DIFF EQ EX FALSE FUN IN INTER INV LET MEET NOT OR PAT
+ %token PROP REF REFOF REL SELECT SUB SUPER TRUE UNION WHERE
%left DIFF WHERE REFOF
%left OR UNION
%left AND INTER
- %nonassoc REL
+ %nonassoc REL
%nonassoc NOT EX IN ATTR
%start qstr query result
vvar:
| DL ID { $2 }
;
- qstr_list:
- | STR CM qstr_list { $1 :: $3 }
- | STR { [$1] }
+ strs:
+ | STR CM strs { $1 :: $3 }
+ | STR { [$1] }
;
- vvar_list:
- | vvar CM vvar_list { $1 :: $3 }
- | vvar { [$1] }
+ subpath:
+ | STR SL subpath { $1 :: $3 }
+ | STR { [$1] }
;
- qstr_path:
- | STR SL qstr_path { $1 :: $3 }
- | STR { [$1] }
+ path:
+ | STR SL subpath { ($1, $3) }
+ | STR { ($1, []) }
+ ;
+ inv:
+ | INV { true }
+ | { false }
+ ;
+ ref:
+ | SUB { MathQL.RefineSub }
+ | SUPER { MathQL.RefineSuper }
+ | { MathQL.RefineExact }
;
- ref_op:
- | SUB { MathQL.SubOp }
- | SUPER { MathQL.SuperOp }
- | { MathQL.ExactOp }
+ assign:
+ | vvar GETS path { (path_of_vvar $1, $3) }
;
+ assigns:
+ | assign CM assigns { $1 :: $3 }
+ | assign { [$1] }
+ ;
val_exp:
- | STR { MathQL.Const [$1] }
- | FUN STR val_exp { MathQL.Fun ($2, $3) }
- | ATTRIB ref_op qstr_path val_exp { MathQL.Attribute ($2, $3, $4) }
- | rvar FS vvar { MathQL.Record ($1, $3) }
- | vvar { MathQL.VVar $1 }
- | LC qstr_list RC { MathQL.Const $2 }
- | LC RC { MathQL.Const [] }
- | REFOF set_exp { MathQL.RefOf $2 }
- | LP val_exp RP { $2 }
+ | STR { MathQL.Const [$1] }
+ | FUN STR val_exp { MathQL.Fun ($2, $3) }
+ | PROP inv ref path val_exp { MathQL.Property ($2, $3, $4, $5) }
+ | rvar FS vvar { MathQL.Record ($1, path_of_vvar $3) }
+ | vvar { MathQL.VVar $1 }
+ | LC strs RC { MathQL.Const $2 }
+ | LC RC { MathQL.Const [] }
+ | REFOF set_exp { MathQL.RefOf $2 }
+ | LP val_exp RP { $2 }
;
boole_exp:
| TRUE { MathQL.True }
| boole_exp OR boole_exp { MathQL.Or ($1, $3) }
;
set_exp:
- | REF val_exp { MathQL.Ref $2 }
- | PAT val_exp { MathQL.Pattern $2 }
- | LP set_exp RP { $2 }
- | SELECT rvar IN set_exp WHERE boole_exp { MathQL.Select ($2, $4, $6) }
- | REL ref_op qstr_path set_exp ATTR vvar_list { MathQL.Relation ($2, $3, $4, $6) }
- | REL ref_op qstr_path set_exp { MathQL.Relation ($2, $3, $4, []) }
- | svar { MathQL.SVar $1 }
- | rvar { MathQL.RVar $1 }
- | set_exp UNION set_exp { MathQL.Union ($1, $3) }
- | set_exp INTER set_exp { MathQL.Intersect ($1, $3) }
- | set_exp DIFF set_exp { MathQL.Diff ($1, $3) }
- | LET svar BE set_exp IN set_exp { MathQL.LetSVar ($2, $4, $6) }
- | LET vvar BE val_exp IN set_exp { MathQL.LetVVar ($2, $4, $6) }
+ | REF val_exp { MathQL.Ref $2 }
+ | PAT val_exp { MathQL.Pattern $2 }
+ | LP set_exp RP { $2 }
+ | SELECT rvar IN set_exp WHERE boole_exp { MathQL.Select ($2, $4, $6) }
+ | REL inv ref path val_exp ATTR assigns { MathQL.Relation ($2, $3, $4, MathQL.Ref $5, $7) }
+ | REL inv ref path val_exp { MathQL.Relation ($2, $3, $4, MathQL.Ref $5, []) }
+ | svar { MathQL.SVar $1 }
+ | rvar { MathQL.RVar $1 }
+ | set_exp UNION set_exp { MathQL.Union ($1, $3) }
+ | set_exp INTER set_exp { MathQL.Intersect ($1, $3) }
+ | set_exp DIFF set_exp { MathQL.Diff ($1, $3) }
+ | LET svar BE set_exp IN set_exp { MathQL.LetSVar ($2, $4, $6) }
+ | LET vvar BE val_exp IN set_exp { MathQL.LetVVar ($2, $4, $6) }
;
query:
| set_exp EOF { $1 }
;
- attribute:
- | STR IS qstr_list { ($1, $3) }
- | STR { ($1, []) }
+ attr:
+ | vvar IS strs { (path_of_vvar $1, $3) }
+ | vvar { (path_of_vvar $1, []) }
;
- attr_list:
- | attribute SC attr_list { $1 :: $3 }
- | attribute { [$1] }
+ attrs:
+ | attr SC attrs { $1 :: $3 }
+ | attr { [$1] }
;
group:
- LC attr_list RC { $2 }
+ LC attrs RC { $2 }
;
- group_list:
- | group CM group_list { $1 :: $3 }
- | group { [$1] }
+ groups:
+ | group CM groups { $1 :: $3 }
+ | group { [$1] }
;
resource:
- | STR ATTR group_list { ($1, $3) }
- | STR { ($1, []) }
+ | STR ATTR groups { ($1, $3) }
+ | STR { ($1, []) }
;
- resource_list:
- | resource SC resource_list { $1 :: $3 }
- | resource { [$1] }
- | { [] }
+ resources:
+ | resource SC resources { $1 :: $3 }
+ | resource { [$1] }
+ | { [] }
;
result:
- | resource_list EOF { $1 }
+ | resources EOF { $1 }
projects / helm.git / blobdiff