Issue 1522: remove unnecessary semicolons

OpenRoberta · Dec 12, 2024 · 162c1cf · 162c1cf
1 parent e3cc541
commit 162c1cf
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 98 deletions.
diff --git a/...ossCompilerTests/_expected/robotSpecific/targetLanguage/joycar/action_digital_pin_test.py b/...ossCompilerTests/_expected/robotSpecific/targetLanguage/joycar/action_digital_pin_test.py
@@ -14,7 +14,7 @@ def run():
     while True:
         if microbit.button_a.is_pressed():
             break
-    microbit.pin12.write_digital(1);
+    microbit.pin12.write_digital(1)
 
 def main():
     try:

diff --git a/...resources/crossCompilerTests/_expected/robotSpecific/targetLanguage/microbit/pin_write.py b/...resources/crossCompilerTests/_expected/robotSpecific/targetLanguage/microbit/pin_write.py
@@ -11,94 +11,94 @@ def run():
     global timer1
     microbit.display.off()
     print("ON Pin 0")
-    microbit.pin0.write_digital(1);
+    microbit.pin0.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 0")
-    microbit.pin0.write_digital(0);
+    microbit.pin0.write_digital(0)
     # -------------------------------------------
     print("100 Analog Pin 1")
-    microbit.pin1.write_analog(100);
+    microbit.pin1.write_analog(100)
     microbit.sleep(500)
     print("0 Analog Pin 1")
-    microbit.pin1.write_analog(0);
+    microbit.pin1.write_analog(0)
     # -------------------------------------------
     print("ON Pin 2")
-    microbit.pin2.write_digital(1);
+    microbit.pin2.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 2")
-    microbit.pin2.write_digital(0);
+    microbit.pin2.write_digital(0)
     # -------------------------------------------
     print("ON Pin 3")
-    microbit.pin3.write_digital(1);
+    microbit.pin3.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 3")
-    microbit.pin3.write_digital(0);
+    microbit.pin3.write_digital(0)
     # -------------------------------------------
     print("ON Pin 4")
-    microbit.pin4.write_digital(1);
+    microbit.pin4.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 4")
-    microbit.pin4.write_digital(0);
+    microbit.pin4.write_digital(0)
     # -------------------------------------------
     print("ON Pin 6")
-    microbit.pin6.write_digital(1);
+    microbit.pin6.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 6")
-    microbit.pin6.write_digital(0);
+    microbit.pin6.write_digital(0)
     # -------------------------------------------
     print("ON Pin 7")
-    microbit.pin7.write_digital(1);
+    microbit.pin7.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 7")
-    microbit.pin7.write_digital(0);
+    microbit.pin7.write_digital(0)
     # -------------------------------------------
     print("ON Pin 8")
-    microbit.pin8.write_digital(1);
+    microbit.pin8.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 8")
-    microbit.pin8.write_digital(0);
+    microbit.pin8.write_digital(0)
     # -------------------------------------------
     print("ON Pin 9")
-    microbit.pin9.write_digital(1);
+    microbit.pin9.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 9")
-    microbit.pin9.write_digital(0);
+    microbit.pin9.write_digital(0)
     # -------------------------------------------
     print("ON Pin 10")
-    microbit.pin10.write_digital(1);
+    microbit.pin10.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 10")
-    microbit.pin10.write_digital(0);
+    microbit.pin10.write_digital(0)
     # -------------------------------------------
     print("ON Pin 12")
-    microbit.pin12.write_digital(1);
+    microbit.pin12.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 12")
-    microbit.pin12.write_digital(0);
+    microbit.pin12.write_digital(0)
     # -------------------------------------------
     print("ON Pin 13")
-    microbit.pin13.write_digital(1);
+    microbit.pin13.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 13")
-    microbit.pin13.write_digital(0);
+    microbit.pin13.write_digital(0)
     # -------------------------------------------
     print("ON Pin 14")
-    microbit.pin14.write_digital(1);
+    microbit.pin14.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 14")
-    microbit.pin14.write_digital(0);
+    microbit.pin14.write_digital(0)
     # -------------------------------------------
     print("ON Pin 15")
-    microbit.pin15.write_digital(1);
+    microbit.pin15.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 15")
-    microbit.pin15.write_digital(0);
+    microbit.pin15.write_digital(0)
     # -------------------------------------------
     print("ON Pin 16")
-    microbit.pin16.write_digital(1);
+    microbit.pin16.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 16")
-    microbit.pin16.write_digital(0);
+    microbit.pin16.write_digital(0)
 
 def main():
     try:

diff --git a/...sources/crossCompilerTests/_expected/robotSpecific/targetLanguage/microbitv2/pin_write.py b/...sources/crossCompilerTests/_expected/robotSpecific/targetLanguage/microbitv2/pin_write.py
@@ -11,94 +11,94 @@ def run():
     global timer1
     microbit.display.off()
     print("ON Pin 0")
-    microbit.pin0.write_digital(1);
+    microbit.pin0.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 0")
-    microbit.pin0.write_digital(0);
+    microbit.pin0.write_digital(0)
     # -------------------------------------------
     print("100 Analog Pin 1")
-    microbit.pin1.write_analog(100);
+    microbit.pin1.write_analog(100)
     microbit.sleep(500)
     print("0 Analog Pin 1")
-    microbit.pin1.write_analog(0);
+    microbit.pin1.write_analog(0)
     # -------------------------------------------
     print("ON Pin 2")
-    microbit.pin2.write_digital(1);
+    microbit.pin2.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 2")
-    microbit.pin2.write_digital(0);
+    microbit.pin2.write_digital(0)
     # -------------------------------------------
     print("ON Pin 3")
-    microbit.pin3.write_digital(1);
+    microbit.pin3.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 3")
-    microbit.pin3.write_digital(0);
+    microbit.pin3.write_digital(0)
     # -------------------------------------------
     print("ON Pin 4")
-    microbit.pin4.write_digital(1);
+    microbit.pin4.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 4")
-    microbit.pin4.write_digital(0);
+    microbit.pin4.write_digital(0)
     # -------------------------------------------
     print("ON Pin 6")
-    microbit.pin6.write_digital(1);
+    microbit.pin6.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 6")
-    microbit.pin6.write_digital(0);
+    microbit.pin6.write_digital(0)
     # -------------------------------------------
     print("ON Pin 7")
-    microbit.pin7.write_digital(1);
+    microbit.pin7.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 7")
-    microbit.pin7.write_digital(0);
+    microbit.pin7.write_digital(0)
     # -------------------------------------------
     print("ON Pin 8")
-    microbit.pin8.write_digital(1);
+    microbit.pin8.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 8")
-    microbit.pin8.write_digital(0);
+    microbit.pin8.write_digital(0)
     # -------------------------------------------
     print("ON Pin 9")
-    microbit.pin9.write_digital(1);
+    microbit.pin9.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 9")
-    microbit.pin9.write_digital(0);
+    microbit.pin9.write_digital(0)
     # -------------------------------------------
     print("ON Pin 10")
-    microbit.pin10.write_digital(1);
+    microbit.pin10.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 10")
-    microbit.pin10.write_digital(0);
+    microbit.pin10.write_digital(0)
     # -------------------------------------------
     print("ON Pin 12")
-    microbit.pin12.write_digital(1);
+    microbit.pin12.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 12")
-    microbit.pin12.write_digital(0);
+    microbit.pin12.write_digital(0)
     # -------------------------------------------
     print("ON Pin 13")
-    microbit.pin13.write_digital(1);
+    microbit.pin13.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 13")
-    microbit.pin13.write_digital(0);
+    microbit.pin13.write_digital(0)
     # -------------------------------------------
     print("ON Pin 14")
-    microbit.pin14.write_digital(1);
+    microbit.pin14.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 14")
-    microbit.pin14.write_digital(0);
+    microbit.pin14.write_digital(0)
     # -------------------------------------------
     print("ON Pin 15")
-    microbit.pin15.write_digital(1);
+    microbit.pin15.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 15")
-    microbit.pin15.write_digital(0);
+    microbit.pin15.write_digital(0)
     # -------------------------------------------
     print("ON Pin 16")
-    microbit.pin16.write_digital(1);
+    microbit.pin16.write_digital(1)
     microbit.sleep(500)
     print("OFF Pin 16")
-    microbit.pin16.write_digital(0);
+    microbit.pin16.write_digital(0)
 
 def main():
     try:

diff --git a/...urces/crossCompilerTests/_expected/robotSpecific/targetLanguage/spike/actionSoundLight.py b/...urces/crossCompilerTests/_expected/robotSpecific/targetLanguage/spike/actionSoundLight.py
@@ -20,38 +20,38 @@ def set_status_light(color):
 
 def run():
     # sounds
-    hub.speaker.beep(65, 2.0);
-    hub.speaker.beep(67, 1.0);
-    hub.speaker.beep(69, 0.5);
-    hub.speaker.beep(71, 0.25);
-    hub.speaker.beep(72, 0.125);
-    hub.speaker.beep(get_midi_from(400), 100 / 1000);
+    hub.speaker.beep(65, 2.0)
+    hub.speaker.beep(67, 1.0)
+    hub.speaker.beep(69, 0.5)
+    hub.speaker.beep(71, 0.25)
+    hub.speaker.beep(72, 0.125)
+    hub.speaker.beep(get_midi_from(400), 100 / 1000)
     # lights
-    set_status_light('pink');
+    set_status_light('pink')
     wait_for_seconds(500/1000)
-    set_status_light('violet');
+    set_status_light('violet')
     wait_for_seconds(500/1000)
-    set_status_light('blue');
+    set_status_light('blue')
     wait_for_seconds(500/1000)
-    set_status_light('azure');
+    set_status_light('azure')
     wait_for_seconds(500/1000)
-    set_status_light('cyan');
+    set_status_light('cyan')
     wait_for_seconds(500/1000)
-    set_status_light('green');
+    set_status_light('green')
     wait_for_seconds(500/1000)
-    set_status_light('yellow');
+    set_status_light('yellow')
     wait_for_seconds(500/1000)
-    set_status_light('orange');
+    set_status_light('orange')
     wait_for_seconds(500/1000)
-    set_status_light('red');
+    set_status_light('red')
     wait_for_seconds(500/1000)
-    set_status_light('black');
+    set_status_light('black')
     wait_for_seconds(500/1000)
-    set_status_light('white');
+    set_status_light('white')
     wait_for_seconds(500/1000)
-    set_status_light(None);
+    set_status_light(None)
     wait_for_seconds(500/1000)
-    set_status_light('pink');
+    set_status_light('pink')
     wait_for_seconds(500/1000)
     hub.status_light.off()
 

diff --git a/...test/resources/crossCompilerTests/_expected/robotSpecific/targetLanguage/spike/control.py b/...test/resources/crossCompilerTests/_expected/robotSpecific/targetLanguage/spike/control.py
@@ -21,7 +21,7 @@ def run():
         if hub.right_button.is_pressed():
             break
     for ___Element in ___Element2:
-        set_status_light(___Element);
+        set_status_light(___Element)
         wait_for_seconds(500/1000)
 
 def main():

diff --git a/.../test/resources/crossCompilerTests/_expected/robotSpecific/targetLanguage/spike/sensor.py b/.../test/resources/crossCompilerTests/_expected/robotSpecific/targetLanguage/spike/sensor.py
@@ -95,7 +95,7 @@ def run():
             break
         if timer.now() * 1000 > 500:
             break
-    set_status_light('pink');
+    set_status_light('pink')
 
 def main():
     try:

diff --git a/.../crossCompilerTests/_expected/robotSpecific/targetLanguage/spikePybricks/actionDisplay.py b/.../crossCompilerTests/_expected/robotSpecific/targetLanguage/spikePybricks/actionDisplay.py
@@ -11,7 +11,7 @@ def display_text(text):
     hub.display.text("".join(text_list))
 
 def show_animation(image_list):
-    hub.display.animate(image_list, 500);
+    hub.display.animate(image_list, 500)
     wait(500 * len(image_list) - 10)
     hub.display.icon(image_list[len(image_list)-1])
 

diff --git a/...s/crossCompilerTests/_expected/robotSpecific/targetLanguage/spikePybricks/actionSounds.py b/...s/crossCompilerTests/_expected/robotSpecific/targetLanguage/spikePybricks/actionSounds.py
@@ -4,7 +4,7 @@
 import urandom as random
 
 def show_animation(image_list):
-    hub.display.animate(image_list, 500);
+    hub.display.animate(image_list, 500)
     wait(500 * len(image_list) - 10)
     hub.display.icon(image_list[len(image_list)-1])
 
@@ -20,11 +20,11 @@ def show_animation(image_list):
 def run():
     global ___A, ___C
     hub.display.icon(Matrix([[0, 0, 100, 0, 0], [0, 0, 100, 100, 0], [0, 0, 100, 0, 100], [100, 100, 100, 0, 0], [100, 100, 100, 0, 0]]))
-    hub.speaker.beep(261.626, 2000);
-    hub.speaker.beep(391.995, 1000);
-    hub.speaker.beep(783.991, 500);
-    hub.speaker.beep(329.628, 250);
-    hub.speaker.beep(146.832, 125);
+    hub.speaker.beep(261.626, 2000)
+    hub.speaker.beep(391.995, 1000)
+    hub.speaker.beep(783.991, 500)
+    hub.speaker.beep(329.628, 250)
+    hub.speaker.beep(146.832, 125)
     hub.speaker.beep(___A, 250)
     hub.speaker.beep(___C, 250)
 

diff --git a/.../crossCompilerTests/_expected/robotSpecific/targetLanguage/spikePybricks/sensorGesture.py b/.../crossCompilerTests/_expected/robotSpecific/targetLanguage/spikePybricks/sensorGesture.py
@@ -20,7 +20,7 @@ def is_free_fall():
     start = stopWatch.time()
     while stopWatch.time() - start < 333:
         if(get_acceleration() < threshold): 
-            return True;
+            return True
     return False
 
 def is_shaken():

diff --git a/RobotMbed/src/main/java/de/fhg/iais/roberta/visitor/codegen/JoyCarPythonVisitor.java b/RobotMbed/src/main/java/de/fhg/iais/roberta/visitor/codegen/JoyCarPythonVisitor.java
@@ -449,7 +449,7 @@ public Void visitMbedPinWriteValueAction(MbedPinWriteValueAction mbedPinWriteVal
         String valueType = mbedPinWriteValueAction.pinValue.equals(SC.DIGITAL) ? "digital(" : "analog(";
         this.src.add(".write_", valueType);
         mbedPinWriteValueAction.value.accept(this);
-        this.src.add(");");
+        this.src.add(")");
         return null;
     }
 

diff --git a/RobotMbed/src/main/java/de/fhg/iais/roberta/visitor/codegen/MbedPythonVisitor.java b/RobotMbed/src/main/java/de/fhg/iais/roberta/visitor/codegen/MbedPythonVisitor.java
@@ -377,7 +377,7 @@ public Void visitMbedPinWriteValueAction(MbedPinWriteValueAction mbedPinWriteVal
         String valueType = mbedPinWriteValueAction.pinValue.equals(SC.DIGITAL) ? "digital(" : "analog(";
         this.src.add(".write_", valueType);
         mbedPinWriteValueAction.value.accept(this);
-        this.src.add(");");
+        this.src.add(")");
         return null;
     }