feat: remove case colons

elkoDev · elkoDev · commit ef9f4f8afc0d · 2025-10-27T13:06:08.000+01:00
diff --git a/language/bcs-engineering-dsl-0.0.25.vsix b/language/bcs-engineering-dsl-0.0.25.vsix
diff --git a/language/package.json b/language/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.0.24",
+  "version": "0.0.25",
   "name": "bcs-engineering-dsl",
   "displayName": "BCS Engineering DSL",
   "icon": "icon.png",
diff --git a/language/railroad/svg/bcs-control/CaseOption.svg b/language/railroad/svg/bcs-control/CaseOption.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" xmlns="http://www.w3.org/2000/svg" width="645" height="81" viewBox="0 0 645 81">
+<svg class="railroad-diagram" xmlns="http://www.w3.org/2000/svg" width="597" height="81" viewBox="0 0 597 81">
 <style>
     svg.railroad-diagram {
         background-color: hsl(30,20%,95%);
@@ -28,7 +28,7 @@
 <path d="M 20 31 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
 <g>
 <path d="M40 41h0"></path>
-<path d="M604 41h0"></path>
+<path d="M556 41h0"></path>
 <path d="M40 41h10"></path>
 <g>
 <path d="M50 41h0"></path>
@@ -98,20 +98,12 @@
 <path d="M476 41h10"></path>
 <g>
 <path d="M486 41h0"></path>
-<path d="M514 41h0"></path>
-<rect x="486" y="30" width="28" height="22" rx="10" ry="10"></rect>
-<text x="500" y="45">:</text>
+<path d="M546 41h0"></path>
+<rect x="486" y="30" width="60" height="22"></rect>
+<text x="516" y="45">Block</text>
 </g>
-<path d="M514 41h10"></path>
-<path d="M524 41h10"></path>
-<g>
-<path d="M534 41h0"></path>
-<path d="M594 41h0"></path>
-<rect x="534" y="30" width="60" height="22"></rect>
-<text x="564" y="45">Block</text>
-</g>
-<path d="M594 41h10"></path>
+<path d="M546 41h10"></path>
 </g>
-<path d="M 604 41 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
+<path d="M 556 41 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
 </g>
 </svg>
diff --git a/language/railroad/svg/bcs-control/DefaultOption.svg b/language/railroad/svg/bcs-control/DefaultOption.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" xmlns="http://www.w3.org/2000/svg" width="305" height="62" viewBox="0 0 305 62">
+<svg class="railroad-diagram" xmlns="http://www.w3.org/2000/svg" width="257" height="62" viewBox="0 0 257 62">
 <style>
     svg.railroad-diagram {
         background-color: hsl(30,20%,95%);
@@ -28,7 +28,7 @@
 <path d="M 20 21 v 20 m 10 -20 v 20 m -10 -10 h 20.5"></path>
 <g>
 <path d="M40 31h0"></path>
-<path d="M264 31h0"></path>
+<path d="M216 31h0"></path>
 <path d="M40 31h10"></path>
 <g>
 <path d="M50 31h0"></path>
@@ -40,20 +40,12 @@
 <path d="M136 31h10"></path>
 <g>
 <path d="M146 31h0"></path>
-<path d="M174 31h0"></path>
-<rect x="146" y="20" width="28" height="22" rx="10" ry="10"></rect>
-<text x="160" y="35">:</text>
+<path d="M206 31h0"></path>
+<rect x="146" y="20" width="60" height="22"></rect>
+<text x="176" y="35">Block</text>
 </g>
-<path d="M174 31h10"></path>
-<path d="M184 31h10"></path>
-<g>
-<path d="M194 31h0"></path>
-<path d="M254 31h0"></path>
-<rect x="194" y="20" width="60" height="22"></rect>
-<text x="224" y="35">Block</text>
-</g>
-<path d="M254 31h10"></path>
+<path d="M206 31h10"></path>
 </g>
-<path d="M 264 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
+<path d="M 216 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path>
 </g>
 </svg>
diff --git a/language/src/language/bcs-control.langium b/language/src/language/bcs-control.langium
@@ -200,11 +200,11 @@ SwitchStmt:
 ;
 
 CaseOption:
-    'case' (literals+=CaseLiteral (',' literals+=CaseLiteral)*) ':' Block
+    'case' (literals+=CaseLiteral (',' literals+=CaseLiteral)*) Block
 ;
 
 DefaultOption:
-    'default' ':' Block
+    'default'  Block
 ;
 
 ExpressionStmt:
diff --git a/language/test/generating/nested_control_test/input/nested_control_test.bcsctrl b/language/test/generating/nested_control_test/input/nested_control_test.bcsctrl
@@ -43,19 +43,19 @@ control NestedControlTestController {
                     
                     // Different processing based on state
                     switch (iState) {
-                        case ProcessState.INIT: {
+                        case ProcessState.INIT {
                             // Initialization processing
                             tempSum = tempSum + iValues[i] * 0.8;
                         }
-                        case ProcessState.PROCESSING: {
+                        case ProcessState.PROCESSING {
                             // Normal processing - with nested if
                             if (iValues[i] > iThreshold * 2.0) {
                                 tempSum = tempSum + iValues[i] * 1.5;
                             } else {
                                 tempSum = tempSum + iValues[i];
                             }
                         }
-                        default: {
+                        default {
                             // Should not happen, but handle anyway
                             tempSum = tempSum + iValues[i] * 0.5;
                         }
diff --git a/language/test/generating/switch_test/input/switch_test.bcsctrl b/language/test/generating/switch_test/input/switch_test.bcsctrl
@@ -24,22 +24,22 @@ control SwitchTestController {
             adjustedTemp = iTemperature * 1.05;
             
             switch (iMode) {
-                case OperationMode.IDLE: {
+                case OperationMode.IDLE {
                     oHeatingValue = 0.0;
                     oCoolingValue = 0.0;
                     oStatusMessage = "System idle";
                 }
-                case OperationMode.HEATING: {
+                case OperationMode.HEATING {
                     oHeatingValue = adjustedTemp;
                     oCoolingValue = 0.0;
                     oStatusMessage = "Heating active";
                 }
-                case OperationMode.COOLING: {
+                case OperationMode.COOLING {
                     oHeatingValue = 0.0;
                     oCoolingValue = adjustedTemp;
                     oStatusMessage = "Cooling active";
                 }
-                default: {
+                default {
                     oHeatingValue = 0.0;
                     oCoolingValue = 0.0;
                     oStatusMessage = "Error state";
diff --git a/language/test/validating/files/invalid_switch/control_switch.bcsctrl b/language/test/validating/files/invalid_switch/control_switch.bcsctrl
@@ -12,23 +12,23 @@ control InvalidSwitchTestController {
     unit TestUnit {
         var status_should_fail: Status; // Moved to unit level
         switch (mode_should_fail){
-            case Status.OFF:{
+            case Status.OFF{
             // Nested variable declarations no longer allowed
                 status_should_fail = Status.ON;
             }
-            case Mode.ECO:{
+            case Mode.ECO{
             // Nested variable declarations no longer allowed
                 status_should_fail = Status.OFF;
             }
-            case Mode.ECO:{
+            case Mode.ECO{
             // Nested variable declarations no longer allowed  
                 status_should_fail = Status.ON;
             }
-            case true:{
+            case true{
             // Nested variable declarations no longer allowed
                 status_should_fail = Status.OFF;
             }
-            default:{
+            default{
             // Nested variable declarations no longer allowed
                 status_should_fail = Status.ON;
             }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "0.0.24",`
	`2`	`+ "version": "0.0.25",`
`3`	`3`	`"name": "bcs-engineering-dsl",`
`4`	`4`	`"displayName": "BCS Engineering DSL",`
`5`	`5`	`"icon": "icon.png",`
Original file line number	Diff line number	Diff line change
`@@ -200,11 +200,11 @@ SwitchStmt:`
`200`	`200`	`;`
`201`	`201`
`202`	`202`	`CaseOption:`
`203`		`- 'case' (literals+=CaseLiteral (',' literals+=CaseLiteral)*) ':' Block`
	`203`	`+ 'case' (literals+=CaseLiteral (',' literals+=CaseLiteral)*) Block`
`204`	`204`	`;`
`205`	`205`
`206`	`206`	`DefaultOption:`
`207`		`- 'default' ':' Block`
	`207`	`+ 'default' Block`
`208`	`208`	`;`
`209`	`209`
`210`	`210`	`ExpressionStmt:`
Original file line number	Diff line number	Diff line change
`@@ -43,19 +43,19 @@ control NestedControlTestController {`
`43`	`43`
`44`	`44`	`// Different processing based on state`
`45`	`45`	`switch (iState) {`
`46`		`- case ProcessState.INIT: {`
	`46`	`+ case ProcessState.INIT {`
`47`	`47`	`// Initialization processing`
`48`	`48`	`tempSum = tempSum + iValues[i] * 0.8;`
`49`	`49`	`}`
`50`		`- case ProcessState.PROCESSING: {`
	`50`	`+ case ProcessState.PROCESSING {`
`51`	`51`	`// Normal processing - with nested if`
`52`	`52`	`if (iValues[i] > iThreshold * 2.0) {`
`53`	`53`	`tempSum = tempSum + iValues[i] * 1.5;`
`54`	`54`	`} else {`
`55`	`55`	`tempSum = tempSum + iValues[i];`
`56`	`56`	`}`
`57`	`57`	`}`
`58`		`- default: {`
	`58`	`+ default {`
`59`	`59`	`// Should not happen, but handle anyway`
`60`	`60`	`tempSum = tempSum + iValues[i] * 0.5;`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,23 +12,23 @@ control InvalidSwitchTestController {`
`12`	`12`	`unit TestUnit {`
`13`	`13`	`var status_should_fail: Status; // Moved to unit level`
`14`	`14`	`switch (mode_should_fail){`
`15`		`- case Status.OFF:{`
	`15`	`+ case Status.OFF{`
`16`	`16`	`// Nested variable declarations no longer allowed`
`17`	`17`	`status_should_fail = Status.ON;`
`18`	`18`	`}`
`19`		`- case Mode.ECO:{`
	`19`	`+ case Mode.ECO{`
`20`	`20`	`// Nested variable declarations no longer allowed`
`21`	`21`	`status_should_fail = Status.OFF;`
`22`	`22`	`}`
`23`		`- case Mode.ECO:{`
	`23`	`+ case Mode.ECO{`
`24`	`24`	`// Nested variable declarations no longer allowed`
`25`	`25`	`status_should_fail = Status.ON;`
`26`	`26`	`}`
`27`		`- case true:{`
	`27`	`+ case true{`
`28`	`28`	`// Nested variable declarations no longer allowed`
`29`	`29`	`status_should_fail = Status.OFF;`
`30`	`30`	`}`
`31`		`- default:{`
	`31`	`+ default{`
`32`	`32`	`// Nested variable declarations no longer allowed`
`33`	`33`	`status_should_fail = Status.ON;`
`34`	`34`	`}`