@freelog/freelog-cg-collection 1.0.22 → 1.0.23

package/CollectionPolicyCustomDataVisitor.js

@@ -41,8 +41,21 @@ class CollectionPolicyCustomDataVisitor extends CollectionPolicyVisitor {
         return super.visitExpression_definition(ctx);
     }
 
+    visitState_definition_section(ctx) {
+        let result = super.visitState_definition_section(ctx);
+        if (this.stateNames.indexOf("Initial") === -1) {
+            throw new Error(`缺少【Initial】状态！`);
+        }
+
+        return result;
+    }
+
     visitState_definition(ctx) {
-        this.stateNames.push(ctx.state_name().getText());
+        let stateName = ctx.state_name_section().state_name().getText();
+        if (this.stateNames.indexOf(stateName) !== -1) {
+            throw new Error(`已存在该状态 --- ${stateName} | ${ctx.state_name_section().getText()}`);
+        }
+        this.stateNames.push(stateName);
 
         return super.visitState_definition(ctx);
     }

package/CollectionPolicyCustomVisitor.js

@@ -304,16 +304,16 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
     }
 
     visitState_definition(ctx) {
-        console.debug(`^^ ${ctx.state_name().getText()}`)
+        console.debug(`^^ ${ctx.state_name_section().state_name().getText()}`)
 
         this.parseState.inFsmState = 1;
-        this.currentState = ctx.state_name().getText();
+        this.currentState = ctx.state_name_section().state_name().getText();
         this.currentStateObj = {stateName: this.currentState, assignments: [], events: []};
-        if (ctx.service_state_section() != null) {
-            this.currentStateObj["serviceStateSection"] = this.visitService_state_section(ctx.service_state_section());
+        if (ctx.state_name_section().service_state_section() != null) {
+            this.currentStateObj["serviceStateSection"] = this.visitService_state_section(ctx.state_name_section().service_state_section());
         }
-        if (ctx.state_context_args_section() != null) {
-            this.currentStateObj["stateContextArgs"] = ctx.state_context_args_section().ID().map(i => i.getText());
+        if (ctx.state_name_section().state_context_args_section() != null) {
+            this.currentStateObj["stateContextArgs"] = ctx.state_name_section().state_context_args_section().ID().map(i => i.getText());
         } else {
             this.currentStateObj["stateContextArgs"] = [];
         }
@@ -453,6 +453,9 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
                 throw new Error(`存在无效的变量引用 --- ${vc} | ${this.currentEventElem["content"]}`);
             }
         }
+        if (this.policyData["stateNames"].indexOf(this.currentEventElem["toState"]) === -1) {
+            throw new Error(`无效的状态 --- ${this.currentEventElem["toState"]} | ${this.currentEventElem["content"]}`);
+        }
 
         if (ctx.state_context_args_section_at_event() != null) {
             this.visitState_context_args_section_at_event(ctx.state_context_args_section_at_event());

package/gen/CollectionPolicyListener.js

@@ -200,6 +200,15 @@ CollectionPolicyListener.prototype.exitState_definition = function(ctx) {
 };
 
 
+// Enter a parse tree produced by CollectionPolicyParser#state_name_section.
+CollectionPolicyListener.prototype.enterState_name_section = function(ctx) {
+};
+
+// Exit a parse tree produced by CollectionPolicyParser#state_name_section.
+CollectionPolicyListener.prototype.exitState_name_section = function(ctx) {
+};
+
+
 // Enter a parse tree produced by CollectionPolicyParser#state_name.
 CollectionPolicyListener.prototype.enterState_name = function(ctx) {
 };