|
@@ -65,7 +65,7 @@
|
|
|
var ref = ast.references[r];
|
|
var ref = ast.references[r];
|
|
|
|
|
|
|
|
if (!model.behaviors[ref])
|
|
if (!model.behaviors[ref])
|
|
|
- model.behaviors[ref] = { type:"Behavior", id:ref, body:[], refs:[] };
|
|
|
|
|
|
|
+ model.behaviors[ref] = new Behavior(ref, [], [])
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return warnify(model);
|
|
return warnify(model);
|
|
@@ -220,7 +220,7 @@ interaction_statement "Interaction"
|
|
|
interaction_type
|
|
interaction_type
|
|
|
= _ t:( ORDER / JOIN ) _
|
|
= _ t:( ORDER / JOIN ) _
|
|
|
{ return t; }
|
|
{ return t; }
|
|
|
-
|
|
|
|
|
|
|
+/* FIXME: selector patterns should be different from definition patterns */
|
|
|
system_item_selector "Selector"
|
|
system_item_selector "Selector"
|
|
|
= !([a-z0-9 ]i+ operator) _ sys:system_id ":" _ p:behavior_pattern _
|
|
= !([a-z0-9 ]i+ operator) _ sys:system_id ":" _ p:behavior_pattern _
|
|
|
{ return new ast.Selector(sys, p); }
|
|
{ return new ast.Selector(sys, p); }
|