diff --git a/src/ingame_programming/Script.java b/src/ingame_programming/Script.java index 5fa014ac30844aeb2694b624419666c9c2f3ccdf..7745a075bae9926b71865e767010cf974d8a722c 100644 --- a/src/ingame_programming/Script.java +++ b/src/ingame_programming/Script.java @@ -44,7 +44,6 @@ public class Script implements ScriptConstants { while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: - ; break; default: jj_la1[0] = jj_gen; @@ -74,16 +73,14 @@ public class Script implements ScriptConstants { t = jj_consume_token(CLASS); /* Traitements divers TODO */ s = "de la classe " + t.image; - {if (true) return s;} - break; + return s; case NOMME: jj_consume_token(NOMME); jj_consume_token(SPACE); t = jj_consume_token(NAME); /* Traitements divers TODO */ s = "nomm\u00e9 " + t.image; - {if (true) return s;} - break; + return s; case AVEC: jj_consume_token(AVEC); jj_consume_token(SPACE); @@ -96,7 +93,6 @@ public class Script implements ScriptConstants { break; default: jj_la1[1] = jj_gen; - ; } t = jj_consume_token(CMP); /* Traitements divers TODO */ @@ -113,7 +109,7 @@ public class Script implements ScriptConstants { s += "\u2265"; break; default: - {if (true) throw new ParseException("Invalid comparator: " + t.image);} + throw new ParseException("Invalid comparator: " + t.image); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SPACE: @@ -121,13 +117,11 @@ public class Script implements ScriptConstants { break; default: jj_la1[2] = jj_gen; - ; } t = jj_consume_token(VAL); /* Traitements divers TODO */ s += t.image; - {if (true) return s;} - break; + return s; case POSSEDANT: jj_consume_token(POSSEDANT); jj_consume_token(SPACE); @@ -142,10 +136,9 @@ public class Script implements ScriptConstants { s += "potion"; break; default: - {if (true) throw new ParseException("Invalid item: " + t.image);} + throw new ParseException("Invalid item: " + t.image); } - {if (true) return s;} - break; + return s; case 18: jj_consume_token(18); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -154,7 +147,6 @@ public class Script implements ScriptConstants { break; default: jj_la1[3] = jj_gen; - ; } s = Option(); /* Traitements divers TODO */ @@ -169,25 +161,21 @@ public class Script implements ScriptConstants { break; default: jj_la1[4] = jj_gen; - ; } jj_consume_token(19); /* Traitements divers TODO */ ss += " " + t.image.toLowerCase() + " " + s + ")"; - {if (true) return ss;} - break; + return ss; case NO: jj_consume_token(NO); s = Option(); s = "non" + s; - {if (true) return s;} - break; + return s; default: jj_la1[5] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - throw new Error("Missing return statement in function"); } static private boolean jj_initialized_once = false;