@freelog/freelog-cg-collection 1.0.12 → 1.0.13

package/CollectionPolicyCustomVisitor.js

@@ -188,9 +188,9 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             varValueObj: this.visitAssignment_clause(ctx.variable_assignment().assignment_clause())
         };
 
-        if (this.varDeclarationMap.has(assignmentElem.varName)) {
-            throw new Error(`全局变量不可以被再次赋值 --- ${assignmentElem.varName}`);
-        }
+        // if (this.varDeclarationMap.has(assignmentElem.varName)) {
+        //     throw new Error(`全局变量不可以被再次赋值 --- ${assignmentElem.varName}`);
+        // }
         if (this.currentStateObj["assignments"].find(elem => {
             return elem.varName === assignmentElem.varName;
         }) == null) {
@@ -224,6 +224,9 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         if (this.varDeclarationMap.has(assignmentElem.varName)) {
             throw new Error(`局部变量不可以和全局变量同名 --- ${assignmentElem.varName}`);
         }
+        if (this.currentStateObj["stateContextArgs"].indexOf(assignmentElem.varName) !== -1) {
+            throw new Error(`局部变量不可以和状态环境参数同名 --- ${assignmentElem.varName}`)
+        }
         if (this.currentStateObj["assignments"].find(elem => {
             return elem.varName === assignmentElem.varName;
         }) != null) {
@@ -280,12 +283,12 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         }
 
         if (ctx.state_context_args_section_at_event() != null) {
-            this.currentEventElem["stateContextArgs"] = ctx.state_context_args_section_at_event().variable_assignment().map(elem => {
+            this.currentEventElem["stateContextArgs"] = ctx.state_context_args_section_at_event().sc_args_at_event_param().map(elem => {
                 this.parseState.inContextArgsSectionAtEvent = 1;
                 let paramElem = {
-                    paramName: elem.ID().getText(),
-                    paramValue: elem.assignment_clause().getText(),
-                    paramValueObj: this.visitAssignment_clause(elem.assignment_clause()),
+                    paramName: elem.sc_args_at_event_param_name().getText(),
+                    paramValue: elem.sc_args_at_event_param_value().assignment_clause().getText(),
+                    paramValueObj: this.visitAssignment_clause(elem.sc_args_at_event_param_value().assignment_clause()),
                     content: elem.getText()
                 };
                 this.parseState.inContextArgsSectionAtEvent = 0;
@@ -293,7 +296,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
                 if (paramElem["paramValueObj"]["expType"] === "variableChain"
                     && context_variables.indexOf(paramElem["paramValue"]) === -1
                     && !this.varDeclarationMap.has(paramElem["paramValue"])
-                    && this.currentStateObj["stateContextArgs"].find(sca => `contextArgs.${sca}` === paramElem["paramValue"]) == null
+                    && this.currentStateObj["stateContextArgs"].indexOf(paramElem["paramValue"]) === -1
                     && this.currentStateObj["assignments"].find(assignment => assignment.varName === paramElem["paramValue"]) == null
                     && event_configParamList.find(event_configParam => {
                             if (event_configParam["type"] === "argsGroup") {

package/gen/CollectionPolicyListener.js

@@ -254,6 +254,33 @@ CollectionPolicyListener.prototype.exitState_context_args_section_at_event = fun
 };
 
 
+// Enter a parse tree produced by CollectionPolicyParser#sc_args_at_event_param.
+CollectionPolicyListener.prototype.enterSc_args_at_event_param = function(ctx) {
+};
+
+// Exit a parse tree produced by CollectionPolicyParser#sc_args_at_event_param.
+CollectionPolicyListener.prototype.exitSc_args_at_event_param = function(ctx) {
+};
+
+
+// Enter a parse tree produced by CollectionPolicyParser#sc_args_at_event_param_name.
+CollectionPolicyListener.prototype.enterSc_args_at_event_param_name = function(ctx) {
+};
+
+// Exit a parse tree produced by CollectionPolicyParser#sc_args_at_event_param_name.
+CollectionPolicyListener.prototype.exitSc_args_at_event_param_name = function(ctx) {
+};
+
+
+// Enter a parse tree produced by CollectionPolicyParser#sc_args_at_event_param_value.
+CollectionPolicyListener.prototype.enterSc_args_at_event_param_value = function(ctx) {
+};
+
+// Exit a parse tree produced by CollectionPolicyParser#sc_args_at_event_param_value.
+CollectionPolicyListener.prototype.exitSc_args_at_event_param_value = function(ctx) {
+};
+
+
 // Enter a parse tree produced by CollectionPolicyParser#action_section.
 CollectionPolicyListener.prototype.enterAction_section = function(ctx) {
 };