From e77afdb148b367e7351dbd57adb680eeb8d73bb6 Mon Sep 17 00:00:00 2001 From: Retera Date: Mon, 20 Sep 2021 01:16:35 -0400 Subject: [PATCH] Update jass parsing systems to better support some test maps --- core/assets/badlogic.jpg | Bin 68465 -> 0 bytes .../warsmash/WarsmashGdxMapScreen.java | 6 + .../warsmash/WarsmashGdxMenuScreen.java | 21 +- .../etheller/warsmash/parsers/jass/Jass2.java | 342 +++++++++++++++++- .../jass/triggers/BoolExprCondition.java | 11 +- .../parsers/jass/triggers/BoolExprFilter.java | 11 +- .../parsers/w3x/w3i/RandomUnitTable.java | 3 +- .../warsmash/util/WarsmashConstants.java | 4 +- .../viewer5/handlers/w3x/War3MapViewer.java | 31 +- .../w3x/rendersim/RenderDestructable.java | 1 + .../handlers/w3x/simulation/CSimulation.java | 13 +- .../handlers/w3x/simulation/CWidget.java | 4 +- .../simulation/abilities/CAbilityView.java | 3 +- .../abilities/GetAbilityByRawcodeVisitor.java | 140 +++++++ .../w3x/simulation/ai/AIDifficulty.java | 9 +- .../w3x/simulation/combat/CAttackType.java | 9 +- .../w3x/simulation/item/CItemTypeJass.java | 9 +- .../w3x/simulation/players/CAllianceType.java | 9 +- .../w3x/simulation/players/CMapControl.java | 9 +- .../w3x/simulation/players/CMapFlag.java | 9 +- .../w3x/simulation/players/CMapPlacement.java | 9 +- .../w3x/simulation/players/CPlayer.java | 9 + .../w3x/simulation/players/CPlayerColor.java | 9 +- .../simulation/players/CPlayerGameResult.java | 9 +- .../w3x/simulation/players/CPlayerScore.java | 9 +- .../w3x/simulation/players/CPlayerState.java | 9 +- .../w3x/simulation/players/CRace.java | 9 +- .../simulation/players/CRacePreference.java | 9 +- .../w3x/simulation/players/CStartLocPrio.java | 9 +- .../region/CRegionTriggerLeave.java | 2 +- .../w3x/simulation/state/CGameState.java | 9 +- .../w3x/simulation/state/CUnitState.java | 9 +- .../w3x/simulation/timers/CTimerJass.java | 8 +- .../trigger/JassGameEventsWar3.java | 9 +- .../trigger/enumtypes/CBlendMode.java | 9 +- .../trigger/enumtypes/CCameraField.java | 9 +- .../trigger/enumtypes/CDamageType.java | 9 +- .../trigger/enumtypes/CEffectType.java | 9 +- .../trigger/enumtypes/CFogState.java | 9 +- .../trigger/enumtypes/CGameSpeed.java | 9 +- .../trigger/enumtypes/CGameType.java | 9 +- .../trigger/enumtypes/CMapDensity.java | 9 +- .../trigger/enumtypes/CMapDifficulty.java | 9 +- .../trigger/enumtypes/CPathingTypeJass.java | 9 +- .../trigger/enumtypes/CPlayerSlotState.java | 9 +- .../trigger/enumtypes/CRarityControl.java | 9 +- .../trigger/enumtypes/CSoundType.java | 9 +- .../trigger/enumtypes/CSoundVolumeGroup.java | 9 +- .../trigger/enumtypes/CTexMapFlags.java | 9 +- .../trigger/enumtypes/CVersion.java | 9 +- .../enumtypes/CWeaponSoundTypeJass.java | 9 +- .../w3x/simulation/unit/CUnitTypeJass.java | 9 +- .../w3x/simulation/util/CHashtable.java | 30 ++ .../viewer5/handlers/w3x/ui/MeleeUI.java | 17 +- .../viewer5/handlers/w3x/ui/MenuUI.java | 4 +- jassparser/antlr-src/Jass.g4 | 13 +- .../ast/debug/DebuggingJassFunction.java | 34 ++ .../ast/debug/DebuggingJassStatement.java | 25 ++ .../interpreter/ast/debug/JassException.java | 22 ++ .../ast/debug/JassStackElement.java | 38 ++ .../ast/expression/ArithmeticSigns.java | 18 +- .../ast/function/AbstractJassFunction.java | 6 + .../ast/function/JassNativeManager.java | 7 +- .../interpreter/ast/scope/GlobalScope.java | 54 ++- .../ast/scope/trigger/Trigger.java | 8 +- .../ast/scope/variableevent/CLimitOp.java | 9 +- .../JassArrayedAssignmentStatement.java | 7 +- .../ast/statement/JassCallStatement.java | 5 +- .../ast/statement/JassExitWhenStatement.java | 5 +- .../ast/statement/JassIfElseIfStatement.java | 7 +- .../ast/statement/JassIfElseStatement.java | 7 +- .../ast/statement/JassIfStatement.java | 5 +- .../JassLocalDefinitionStatement.java | 6 +- .../ast/statement/JassLocalStatement.java | 13 +- .../ast/statement/JassLoopStatement.java | 5 +- .../statement/JassReturnNothingStatement.java | 6 - .../ast/statement/JassReturnStatement.java | 5 +- .../ast/statement/JassSetStatement.java | 5 +- .../interpreter/ast/util/CHandle.java | 5 + .../interpreter/ast/util/JassSettings.java | 5 + .../interpreter/ast/value/ArrayJassValue.java | 17 + .../ast/value/HandleJassValue.java | 5 + .../ast/value/IntegerJassValue.java | 1 + .../interpreter/ast/value/RealJassValue.java | 1 + .../ast/value/StringJassValue.java | 1 + .../ast/visitors/JassExpressionVisitor.java | 7 + .../ast/visitors/JassProgramVisitor.java | 25 +- .../ast/visitors/JassStatementVisitor.java | 67 ++-- 88 files changed, 1217 insertions(+), 202 deletions(-) delete mode 100644 core/assets/badlogic.jpg create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java create mode 100644 core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/CHashtable.java create mode 100644 jassparser/src/com/etheller/interpreter/ast/debug/DebuggingJassFunction.java create mode 100644 jassparser/src/com/etheller/interpreter/ast/debug/DebuggingJassStatement.java create mode 100644 jassparser/src/com/etheller/interpreter/ast/debug/JassException.java create mode 100644 jassparser/src/com/etheller/interpreter/ast/debug/JassStackElement.java create mode 100644 jassparser/src/com/etheller/interpreter/ast/util/CHandle.java create mode 100644 jassparser/src/com/etheller/interpreter/ast/util/JassSettings.java diff --git a/core/assets/badlogic.jpg b/core/assets/badlogic.jpg deleted file mode 100644 index 4390da6e0f6d041590c6313d2b4c978abc00a342..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68465 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%0D_mtl(=kJ_v@+V;1Dd59><)1Vxf({Tq^pY-s)84 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 diff --git a/core/src/com/etheller/warsmash/WarsmashGdxMapScreen.java b/core/src/com/etheller/warsmash/WarsmashGdxMapScreen.java index 94ee309..0143004 100644 --- a/core/src/com/etheller/warsmash/WarsmashGdxMapScreen.java +++ b/core/src/com/etheller/warsmash/WarsmashGdxMapScreen.java @@ -36,6 +36,7 @@ import com.etheller.warsmash.parsers.jass.Jass2.RootFrameListener; import com.etheller.warsmash.units.DataTable; import com.etheller.warsmash.units.Element; import com.etheller.warsmash.util.ImageUtils; +import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.Model; import com.etheller.warsmash.viewer5.ModelInstance; import com.etheller.warsmash.viewer5.ModelViewer; @@ -208,6 +209,11 @@ public class WarsmashGdxMapScreen implements InputProcessor, Screen { } this.commonEnv = Jass2.loadCommon(this.viewer.mapMpq, this.uiViewport, this.uiScene, this.viewer, this.meleeUI, "Scripts\\common.j", "Scripts\\Blizzard.j", "war3map.j"); + this.commonEnv.config(); + if (WarsmashConstants.LOCAL_TEMP_TEST_ALL_PLAYERS_PLAYING) { + this.viewer.simulation.updateIsPlaying(this.viewer.getMapConfig()); + } + this.commonEnv.main(); } public static DataSource parseDataSources(final DataTable warsmashIni) { diff --git a/core/src/com/etheller/warsmash/WarsmashGdxMenuScreen.java b/core/src/com/etheller/warsmash/WarsmashGdxMenuScreen.java index d6dbff8..d411785 100644 --- a/core/src/com/etheller/warsmash/WarsmashGdxMenuScreen.java +++ b/core/src/com/etheller/warsmash/WarsmashGdxMenuScreen.java @@ -1,5 +1,6 @@ package com.etheller.warsmash; +import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -28,6 +29,7 @@ import com.etheller.warsmash.parsers.jass.Jass2.RootFrameListener; import com.etheller.warsmash.units.DataTable; import com.etheller.warsmash.util.DataSourceFileHandle; import com.etheller.warsmash.util.ImageUtils; +import com.etheller.warsmash.util.StringBundle; import com.etheller.warsmash.util.WarsmashConstants; import com.etheller.warsmash.viewer5.Camera; import com.etheller.warsmash.viewer5.CanvasProvider; @@ -177,6 +179,16 @@ public class WarsmashGdxMenuScreen implements InputProcessor, Screen, SingleMode System.out.println("Loaded"); Gdx.gl30.glClearColor(0.0f, 0.0f, 0.0f, 1); + final DataTable musicSLK = new DataTable(StringBundle.EMPTY); + final String musicSLKPath = "UI\\SoundInfo\\Music.SLK"; + if (this.viewer.dataSource.has(musicSLKPath)) { + try (InputStream miscDataTxtStream = this.viewer.dataSource.getResourceAsStream(musicSLKPath)) { + musicSLK.readSLK(miscDataTxtStream); + } + catch (final IOException e) { + e.printStackTrace(); + } + } this.menuUI = new MenuUI(this.viewer.dataSource, this.uiViewport, this.uiScene, this.viewer, this.game, this, this.warsmashIni, new RootFrameListener() { @@ -188,9 +200,14 @@ public class WarsmashGdxMenuScreen implements InputProcessor, Screen, SingleMode final String musicField = rootFrame .getSkinField("GlueMusic_V" + WarsmashConstants.GAME_VERSION); final String[] musics = musicField.split(";"); - final String musicPath = musics[(int) (Math.random() * musics.length)]; + String musicPath = musics[(int) (Math.random() * musics.length)]; + if (musicSLK.get(musicPath) != null) { + musicPath = musicSLK.get(musicPath).getField("FileNames"); + } + final String[] moreSplitMusics = musicPath.split(","); + final String finalMusicPath = moreSplitMusics[(int) (Math.random() * musics.length)]; final Music music = Gdx.audio.newMusic(new DataSourceFileHandle( - WarsmashGdxMenuScreen.this.viewer.dataSource, musicPath)); + WarsmashGdxMenuScreen.this.viewer.dataSource, finalMusicPath)); // music.setVolume(0.2f); music.setLooping(true); music.play(); diff --git a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java index 4a74d06..2a5f678 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/Jass2.java +++ b/core/src/com/etheller/warsmash/parsers/jass/Jass2.java @@ -20,6 +20,7 @@ import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.utils.viewport.Viewport; import com.etheller.interpreter.JassLexer; import com.etheller.interpreter.JassParser; +import com.etheller.interpreter.ast.debug.JassException; import com.etheller.interpreter.ast.function.JassFunction; import com.etheller.interpreter.ast.scope.GlobalScope; import com.etheller.interpreter.ast.scope.TriggerExecutionScope; @@ -27,16 +28,19 @@ import com.etheller.interpreter.ast.scope.trigger.RemovableTriggerEvent; import com.etheller.interpreter.ast.scope.trigger.Trigger; import com.etheller.interpreter.ast.scope.trigger.TriggerBooleanExpression; import com.etheller.interpreter.ast.scope.variableevent.CLimitOp; +import com.etheller.interpreter.ast.util.CHandle; import com.etheller.interpreter.ast.value.BooleanJassValue; import com.etheller.interpreter.ast.value.HandleJassType; import com.etheller.interpreter.ast.value.HandleJassValue; import com.etheller.interpreter.ast.value.IntegerJassValue; +import com.etheller.interpreter.ast.value.JassType; import com.etheller.interpreter.ast.value.JassValue; import com.etheller.interpreter.ast.value.RealJassValue; import com.etheller.interpreter.ast.value.StringJassValue; import com.etheller.interpreter.ast.value.visitor.BooleanJassValueVisitor; import com.etheller.interpreter.ast.value.visitor.IntegerJassValueVisitor; import com.etheller.interpreter.ast.value.visitor.JassFunctionJassValueVisitor; +import com.etheller.interpreter.ast.value.visitor.JassTypeGettingValueVisitor; import com.etheller.interpreter.ast.value.visitor.ObjectJassValueVisitor; import com.etheller.interpreter.ast.value.visitor.RealJassValueVisitor; import com.etheller.interpreter.ast.value.visitor.StringJassValueVisitor; @@ -75,6 +79,8 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitEnumFunction; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnitType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.CAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.GetAbilityByRawcodeVisitor; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.inventory.CAbilityInventory; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityPointTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.ai.AIDifficulty; @@ -97,6 +103,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CRacePrefer import com.etheller.warsmash.viewer5.handlers.w3x.simulation.players.CStartLocPrio; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.region.CRegion; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.region.CRegionTriggerEnter; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.region.CRegionTriggerLeave; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.sound.CMIDISound; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.sound.CSound; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.sound.CSoundFilename; @@ -125,6 +132,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.C import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CVersion; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes.CWeaponSoundTypeJass; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CUnitTypeJass; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.CHashtable; import com.etheller.warsmash.viewer5.handlers.w3x.ui.MeleeUI; public class Jass2 { @@ -163,6 +171,7 @@ public class Jass2 { sourceName + "line " + line + ":" + charPositionInLine + " " + msg); } }); + jassProgramVisitor.setCurrentFileName(jassFile); jassProgramVisitor.visit(parser.program()); } catch (final Exception e) { @@ -422,6 +431,7 @@ public class Jass2 { } public static final class CommonEnvironment { + private GameUI gameUI; private Element skin; private final JassProgramVisitor jassProgramVisitor; @@ -1459,8 +1469,8 @@ public class Jass2 { final float radius = arguments.get(3).visit(RealJassValueVisitor.getInstance()).floatValue(); final TriggerBooleanExpression filter = nullable(arguments, 4, ObjectJassValueVisitor.getInstance()); - simulation.getWorldCollision().enumUnitsInRect(tempRect.set(x - radius, y - radius, radius, radius), - new CUnitEnumFunction() { + simulation.getWorldCollision().enumUnitsInRect( + tempRect.set(x - radius, y - radius, radius * 2, radius * 2), new CUnitEnumFunction() { @Override public boolean call(final CUnit unit) { @@ -1723,9 +1733,14 @@ public class Jass2 { final TriggerExecutionScope triggerScope) { final List group = arguments.get(0).visit(ObjectJassValueVisitor.>getInstance()); final JassFunction callback = arguments.get(1).visit(JassFunctionJassValueVisitor.getInstance()); - for (final CUnit unit : group) { - callback.call(Collections.emptyList(), globalScope, - CommonTriggerExecutionScope.enumScope(triggerScope, unit)); + try { + for (final CUnit unit : group) { + callback.call(Collections.emptyList(), globalScope, + CommonTriggerExecutionScope.enumScope(triggerScope, unit)); + } + } + catch (final Exception e) { + throw new JassException(globalScope, "Exception during ForGroup", e); } return null; } @@ -1883,9 +1898,14 @@ public class Jass2 { final List force = arguments.get(0) .visit(ObjectJassValueVisitor.>getInstance()); final JassFunction callback = arguments.get(1).visit(JassFunctionJassValueVisitor.getInstance()); - for (final CPlayerJass player : force) { - callback.call(Collections.emptyList(), globalScope, - CommonTriggerExecutionScope.enumScope(triggerScope, player)); + try { + for (final CPlayerJass player : force) { + callback.call(Collections.emptyList(), globalScope, + CommonTriggerExecutionScope.enumScope(triggerScope, player)); + } + } + catch (final Exception e) { + throw new JassException(globalScope, "Exception during ForForce", e); } return null; } @@ -2415,10 +2435,10 @@ public class Jass2 { final TriggerExecutionScope triggerScope) { final Trigger trigger = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); final CRegion region = arguments.get(1).visit(ObjectJassValueVisitor.getInstance()); - final TriggerBooleanExpression boolexpr = arguments.get(2) - .visit(ObjectJassValueVisitor.getInstance()); + final TriggerBooleanExpression boolexpr = nullable(arguments, 2, + ObjectJassValueVisitor.getInstance()); return new HandleJassValue(eventType, - region.add(new CRegionTriggerEnter(globalScope, trigger, boolexpr))); + region.add(new CRegionTriggerLeave(globalScope, trigger, boolexpr))); } }); jassProgramVisitor.getJassNativeManager().createNative("GetLeavingUnit", new JassFunction() { @@ -3029,6 +3049,9 @@ public class Jass2 { public JassValue call(final List arguments, final GlobalScope globalScope, final TriggerExecutionScope triggerScope) { final Trigger whichTrigger = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + if (whichTrigger == null) { + return BooleanJassValue.FALSE; + } return BooleanJassValue.of(whichTrigger.evaluate(globalScope, triggerScope)); } }); @@ -3271,6 +3294,58 @@ public class Jass2 { new Point2D.Double(whichWidget.getX(), whichWidget.getY())); } }); + jassProgramVisitor.getJassNativeManager().createNative("GetUnitAbilityLevel", new JassFunction() { + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + final CUnit whichWidget = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + final int rawcode = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); + final CAbility ability = whichWidget + .getAbility(GetAbilityByRawcodeVisitor.getInstance().reset(new War3ID(rawcode))); + // TODO below code is very stupid!! + return new IntegerJassValue(ability == null ? 0 : 1); + } + }); + jassProgramVisitor.getJassNativeManager().createNative("IncUnitAbilityLevel", new JassFunction() { + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + final CUnit whichWidget = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + final int rawcode = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); + final War3ID war3id = new War3ID(rawcode); + final CAbility ability = whichWidget + .getAbility(GetAbilityByRawcodeVisitor.getInstance().reset(war3id)); + if (ability == null) { + whichWidget.add(simulation, simulation.getAbilityData().createAbility(war3id.toString(), + simulation.getHandleIdAllocator().createId())); + // TODO below code is very stupid!! + return new IntegerJassValue(1); + } + else { + // TODO below code is very stupid!! + return new IntegerJassValue(1); + } + } + }); + jassProgramVisitor.getJassNativeManager().createNative("GetPlayerHandicap", new JassFunction() { + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + final CPlayer whichPlayer = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + return new RealJassValue(whichPlayer.getHandicap()); + } + }); + jassProgramVisitor.getJassNativeManager().createNative("GetHandleId", new JassFunction() { + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + final CHandle whichHandle = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + if (whichHandle == null) { + return IntegerJassValue.ZERO; + } + return new IntegerJassValue(whichHandle.getHandleId()); + } + }); jassProgramVisitor.getJassNativeManager().createNative("AddSpecialEffectTarget", new JassFunction() { @Override public JassValue call(final List arguments, final GlobalScope globalScope, @@ -3577,6 +3652,9 @@ public class Jass2 { public JassValue call(final List arguments, final GlobalScope globalScope, final TriggerExecutionScope triggerScope) { final CUnit whichUnit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + if (whichUnit == null) { + return playerType.getNullValue(); + } return new HandleJassValue(playerType, simulation.getPlayer(whichUnit.getPlayerIndex())); } }); @@ -3667,6 +3745,164 @@ public class Jass2 { return BooleanJassValue.of(group.contains(whichUnit)); } }); + + // Patch 1.23+ crap + jassProgramVisitor.getJassNativeManager().createNative("InitHashtable", new JassFunction() { + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + return new HandleJassValue(hashtableType, new CHashtable()); + } + }); + jassProgramVisitor.getJassNativeManager().createNative("SaveInteger", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveReal", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveBoolean", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveStr", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SavePlayerHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveWidgetHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveDestructableHandle", + new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveItemHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveUnitHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveAbilityHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveTimerHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveTriggerHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveTriggerConditionHandle", + new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveTriggerActionHandle", + new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveTriggerEventHandle", + new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveForceHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveGroupHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveLocationHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveRectHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveBooleanExprHandle", + new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveSoundHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveEffectHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveUnitPoolHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveItemPoolHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveQuestHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveQuestItemHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveDefeatConditionHandle", + new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveTimerDialogHandle", + new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveLeaderboardHandle", + new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveMultiboardHandle", + new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveMultiboardItemHandle", + new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveTrackableHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveDialogHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveButtonHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveTextTagHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveLightningHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveImageHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveUbersplatHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveRegionHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveFogStateHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveFogModifierHandle", + new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveAgentHandle", new SaveHashtableValueFunc()); + jassProgramVisitor.getJassNativeManager().createNative("SaveHashtableHandle", new SaveHashtableValueFunc()); + + jassProgramVisitor.getJassNativeManager().createNative("LoadInteger", + new LoadHashtableValueFunc(IntegerJassValue.ZERO)); + jassProgramVisitor.getJassNativeManager().createNative("LoadReal", + new LoadHashtableValueFunc(RealJassValue.ZERO)); + jassProgramVisitor.getJassNativeManager().createNative("LoadBoolean", + new LoadHashtableValueFunc(BooleanJassValue.FALSE)); + jassProgramVisitor.getJassNativeManager().createNative("LoadStr", + new LoadHashtableValueFunc(StringJassValue.EMPTY_STRING)); + + jassProgramVisitor.getJassNativeManager().createNative("HaveSavedInteger", + new HaveSavedHashtableValueFunc(JassType.INTEGER)); + jassProgramVisitor.getJassNativeManager().createNative("HaveSavedReal", + new HaveSavedHashtableValueFunc(JassType.REAL)); + jassProgramVisitor.getJassNativeManager().createNative("HaveSavedBoolean", + new HaveSavedHashtableValueFunc(JassType.BOOLEAN)); + jassProgramVisitor.getJassNativeManager().createNative("HaveSavedStr", + new HaveSavedHashtableValueFunc(JassType.STRING)); + + jassProgramVisitor.getJassNativeManager().createNative("GetExpiredTimer", new JassFunction() { + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + return new HandleJassValue(timerType, + ((CommonTriggerExecutionScope) triggerScope).getExpiringTimer()); + } + }); + jassProgramVisitor.getJassNativeManager().createNative("GetPlayerStructureCount", new JassFunction() { + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + final CPlayer whichPlayer = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + final boolean includeIncomplete = arguments.get(1).visit(BooleanJassValueVisitor.getInstance()); + final List units = simulation.getUnits(); + int count = 0; + for (final CUnit unit : units) { + if (unit.getPlayerIndex() == whichPlayer.getId()) { + if (includeIncomplete || !unit.isConstructing()) { + count++; + } + } + } + return new IntegerJassValue(count); + } + }); + jassProgramVisitor.getJassNativeManager().createNative("GetPlayerTypedUnitCount", new JassFunction() { + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + final CPlayer whichPlayer = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + final String legacySystemUnitTypeName = arguments.get(1) + .visit(StringJassValueVisitor.getInstance()); + final boolean includeIncomplete = arguments.get(2).visit(BooleanJassValueVisitor.getInstance()); + final boolean includeUpgrades = arguments.get(3).visit(BooleanJassValueVisitor.getInstance()); + final List units = simulation.getUnits(); + int count = 0; + // TODO includeUpgrades is NYI!! + for (final CUnit unit : units) { + if (unit.getPlayerIndex() == whichPlayer.getId()) { + if (legacySystemUnitTypeName.equals(unit.getUnitType().getLegacyName())) { + if (includeIncomplete || !unit.isConstructing()) { + count++; + } + } + } + } + return new IntegerJassValue(count); + } + }); + jassProgramVisitor.getJassNativeManager().createNative("IsUnitEnemy", new JassFunction() { + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + final CUnit whichUnit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + final CPlayer whichPlayer = arguments.get(1).visit(ObjectJassValueVisitor.getInstance()); + if ((whichUnit == null) || (whichPlayer == null)) { + return BooleanJassValue.FALSE; + } + return BooleanJassValue + .of(!whichPlayer.hasAlliance(whichUnit.getPlayerIndex(), CAllianceType.PASSIVE)); + } + }); + jassProgramVisitor.getJassNativeManager().createNative("IsUnitAlly", new JassFunction() { + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + final CUnit whichUnit = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + final CPlayer whichPlayer = arguments.get(1).visit(ObjectJassValueVisitor.getInstance()); + if ((whichUnit == null) || (whichPlayer == null)) { + return BooleanJassValue.FALSE; + } + return BooleanJassValue + .of(whichPlayer.hasAlliance(whichUnit.getPlayerIndex(), CAllianceType.PASSIVE)); + } + }); } private void registerConfigNatives(final JassProgramVisitor jassProgramVisitor, final War3MapConfig mapConfig, @@ -4169,9 +4405,26 @@ public class Jass2 { }); } + public void config() { + try { + this.jassProgramVisitor.getGlobals().getFunctionByName("config").call(Collections.emptyList(), + this.jassProgramVisitor.getGlobals(), JassProgramVisitor.EMPTY_TRIGGER_SCOPE); + } + catch (final Exception exc) { + throw new JassException(this.jassProgramVisitor.getGlobals(), + "Exception on Line " + this.jassProgramVisitor.getGlobals().getLineNumber(), exc); + } + } + public void main() { - this.jassProgramVisitor.getGlobals().getFunctionByName("main").call(Collections.emptyList(), - new GlobalScope(), null); + try { + this.jassProgramVisitor.getGlobals().getFunctionByName("main").call(Collections.emptyList(), + this.jassProgramVisitor.getGlobals(), JassProgramVisitor.EMPTY_TRIGGER_SCOPE); + } + catch (final Exception exc) { + throw new JassException(this.jassProgramVisitor.getGlobals(), + "Exception on Line " + this.jassProgramVisitor.getGlobals().getLineNumber(), exc); + } } } @@ -4286,8 +4539,9 @@ public class Jass2 { @Override public JassValue call(final List arguments, final GlobalScope globalScope, final TriggerExecutionScope triggerScope) { - final String funcName = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + final String funcName = arguments.get(0).visit(StringJassValueVisitor.getInstance()); final JassFunction functionByName = globalScope.getFunctionByName(funcName); + System.out.println("ExecuteFunc (\"" + funcName + "\")"); if (functionByName != null) { // TODO below TriggerExecutionScope.EMPTY is probably not correct functionByName.call(Collections.emptyList(), globalScope, TriggerExecutionScope.EMPTY); @@ -4476,4 +4730,64 @@ public class Jass2 { e.printStackTrace(); } } + + private static final class SaveHashtableValueFunc implements JassFunction { + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + final CHashtable table = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + final Integer parentKey = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); + final Integer childKey = arguments.get(2).visit(IntegerJassValueVisitor.getInstance()); + table.save(parentKey, childKey, arguments.get(3)); + return null; + } + } + + private static final class LoadHashtableValueFunc implements JassFunction { + private final JassValue nullValue; + + public LoadHashtableValueFunc(final JassValue nullValue) { + this.nullValue = nullValue; + } + + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + final CHashtable table = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + final Integer parentKey = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); + final Integer childKey = arguments.get(2).visit(IntegerJassValueVisitor.getInstance()); + final Object loadedValue = table.load(parentKey, childKey); + if (loadedValue == null) { + return this.nullValue; + } + return (JassValue) loadedValue; + } + } + + private static final class HaveSavedHashtableValueFunc implements JassFunction { + private final JassType jassType; + + public HaveSavedHashtableValueFunc(final JassType jassType) { + this.jassType = jassType; + } + + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + final CHashtable table = arguments.get(0).visit(ObjectJassValueVisitor.getInstance()); + final Integer parentKey = arguments.get(1).visit(IntegerJassValueVisitor.getInstance()); + final Integer childKey = arguments.get(2).visit(IntegerJassValueVisitor.getInstance()); + final Object loadedValue = table.load(parentKey, childKey); + if (loadedValue != null) { + if (loadedValue instanceof JassValue) { + final JassValue loadedJassValue = (JassValue) loadedValue; + final JassType type = loadedJassValue.visit(JassTypeGettingValueVisitor.getInstance()); + if (this.jassType.isAssignableFrom(type)) { + return BooleanJassValue.TRUE; + } + } + } + return BooleanJassValue.FALSE; + } + } } diff --git a/core/src/com/etheller/warsmash/parsers/jass/triggers/BoolExprCondition.java b/core/src/com/etheller/warsmash/parsers/jass/triggers/BoolExprCondition.java index 34ef292..524aebd 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/triggers/BoolExprCondition.java +++ b/core/src/com/etheller/warsmash/parsers/jass/triggers/BoolExprCondition.java @@ -2,6 +2,7 @@ package com.etheller.warsmash.parsers.jass.triggers; import java.util.Collections; +import com.etheller.interpreter.ast.debug.JassException; import com.etheller.interpreter.ast.function.JassFunction; import com.etheller.interpreter.ast.scope.GlobalScope; import com.etheller.interpreter.ast.scope.TriggerExecutionScope; @@ -18,8 +19,14 @@ public class BoolExprCondition implements TriggerBooleanExpression { @Override public boolean evaluate(final GlobalScope globalScope, final TriggerExecutionScope triggerScope) { - final JassValue booleanJassReturnValue = this.takesNothingReturnsBooleanFunction.call(Collections.EMPTY_LIST, - globalScope, triggerScope); + final JassValue booleanJassReturnValue; + try { + booleanJassReturnValue = this.takesNothingReturnsBooleanFunction.call(Collections.EMPTY_LIST, globalScope, + triggerScope); + } + catch (final Exception e) { + throw new JassException(globalScope, "Exception during BoolExprCondition.evaluate()", e); + } final Boolean booleanReturnValue = booleanJassReturnValue.visit(BooleanJassValueVisitor.getInstance()); return booleanReturnValue.booleanValue(); } diff --git a/core/src/com/etheller/warsmash/parsers/jass/triggers/BoolExprFilter.java b/core/src/com/etheller/warsmash/parsers/jass/triggers/BoolExprFilter.java index b3a6e27..c2442d3 100644 --- a/core/src/com/etheller/warsmash/parsers/jass/triggers/BoolExprFilter.java +++ b/core/src/com/etheller/warsmash/parsers/jass/triggers/BoolExprFilter.java @@ -2,6 +2,7 @@ package com.etheller.warsmash.parsers.jass.triggers; import java.util.Collections; +import com.etheller.interpreter.ast.debug.JassException; import com.etheller.interpreter.ast.function.JassFunction; import com.etheller.interpreter.ast.scope.GlobalScope; import com.etheller.interpreter.ast.scope.TriggerExecutionScope; @@ -18,8 +19,14 @@ public class BoolExprFilter implements TriggerBooleanExpression { @Override public boolean evaluate(final GlobalScope globalScope, final TriggerExecutionScope triggerScope) { - final JassValue booleanJassReturnValue = this.takesNothingReturnsBooleanFunction.call(Collections.EMPTY_LIST, - globalScope, triggerScope); + final JassValue booleanJassReturnValue; + try { + booleanJassReturnValue = this.takesNothingReturnsBooleanFunction.call(Collections.EMPTY_LIST, globalScope, + triggerScope); + } + catch (final Exception e) { + throw new JassException(globalScope, "Exception during BoolExprFilter.evaluate()", e); + } final Boolean booleanReturnValue = booleanJassReturnValue.visit(BooleanJassValueVisitor.getInstance()); return booleanReturnValue.booleanValue(); } diff --git a/core/src/com/etheller/warsmash/parsers/w3x/w3i/RandomUnitTable.java b/core/src/com/etheller/warsmash/parsers/w3x/w3i/RandomUnitTable.java index 3295681..9cbc550 100644 --- a/core/src/com/etheller/warsmash/parsers/w3x/w3i/RandomUnitTable.java +++ b/core/src/com/etheller/warsmash/parsers/w3x/w3i/RandomUnitTable.java @@ -1,6 +1,7 @@ package com.etheller.warsmash.parsers.w3x.w3i; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import com.etheller.warsmash.util.ParseUtils; @@ -12,7 +13,7 @@ public class RandomUnitTable { private String name; private int positions; private int[] columnTypes; - private List units; + private final List units = new ArrayList<>(); public void load(final LittleEndianDataInputStream stream) throws IOException { this.id = stream.readInt(); // TODO is this a War3ID? diff --git a/core/src/com/etheller/warsmash/util/WarsmashConstants.java b/core/src/com/etheller/warsmash/util/WarsmashConstants.java index 61f078b..766bd1d 100644 --- a/core/src/com/etheller/warsmash/util/WarsmashConstants.java +++ b/core/src/com/etheller/warsmash/util/WarsmashConstants.java @@ -25,7 +25,7 @@ public class WarsmashConstants { // find it yet so I used this public static final String DEFAULT_STRING = "Default string"; - public static final boolean CATCH_CURSOR = true; + public static final boolean CATCH_CURSOR = false; public static final boolean VERBOSE_LOGGING = true; public static final boolean ENABLE_DEBUG = false; public static final char SPECIAL_ESCAPE_KEYCODE = 0x7E; @@ -36,7 +36,7 @@ public class WarsmashConstants { // workaround to fix it if you need the local files // to take priority over built-ins for tilesets. public static final boolean FIX_FLAT_FILES_TILESET_LOADING = false; - public static final boolean ENABLE_MUSIC = false; + public static final boolean ENABLE_MUSIC = true; public static final boolean LOAD_UNITS_FROM_WORLDEDIT_DATA = false; public static final boolean LOCAL_TEMP_TEST_ALL_PLAYERS_PLAYING = true; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java index 75cbcef..dacdabc 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/War3MapViewer.java @@ -205,7 +205,6 @@ public class War3MapViewer extends AbstractMdxModelViewer { public DataTable uiSoundsTable; private MdxComplexInstance confirmationInstance; public MdxComplexInstance dncUnit; - public MdxComplexInstance dncUnitDay; public MdxComplexInstance dncTerrain; public MdxComplexInstance dncTarget; public CSimulation simulation; @@ -1618,17 +1617,22 @@ public class War3MapViewer extends AbstractMdxModelViewer { break; } } - this.dncTerrain.setFrameByRatio( - this.simulation.getGameTimeOfDay() / this.simulation.getGameplayConstants().getGameDayHours()); - this.dncTerrain.update(rawDeltaTime, null); - this.dncUnit.setFrameByRatio( - this.simulation.getGameTimeOfDay() / this.simulation.getGameplayConstants().getGameDayHours()); - this.dncUnit.update(rawDeltaTime, null); - this.dncUnitDay.setFrameByRatio(0.5f); - this.dncUnitDay.update(rawDeltaTime, null); - this.dncTarget.setFrameByRatio( - this.simulation.getGameTimeOfDay() / this.simulation.getGameplayConstants().getGameDayHours()); - this.dncTarget.update(rawDeltaTime, null); + if (this.dncTerrain != null) { + this.dncTerrain.setFrameByRatio( + this.simulation.getGameTimeOfDay() / this.simulation.getGameplayConstants().getGameDayHours()); + this.dncTerrain.update(rawDeltaTime, null); + } + if (this.dncUnit != null) { + this.dncUnit.setFrameByRatio( + this.simulation.getGameTimeOfDay() / this.simulation.getGameplayConstants().getGameDayHours()); + this.dncUnit.update(rawDeltaTime, null); + } + + if (this.dncTarget != null) { + this.dncTarget.setFrameByRatio( + this.simulation.getGameTimeOfDay() / this.simulation.getGameplayConstants().getGameDayHours()); + this.dncTarget.update(rawDeltaTime, null); + } } } @@ -2095,9 +2099,6 @@ public class War3MapViewer extends AbstractMdxModelViewer { this.dncUnit = (MdxComplexInstance) unitDNCModel.addInstance(); this.dncUnit.setSequenceLoopMode(SequenceLoopMode.ALWAYS_LOOP); this.dncUnit.setSequence(0); - this.dncUnitDay = (MdxComplexInstance) unitDNCModel.addInstance(); - this.dncUnitDay.setSequenceLoopMode(SequenceLoopMode.ALWAYS_LOOP); - this.dncUnitDay.setSequence(0); final MdxModel targetDNCModel = (MdxModel) load( mdx("Environment\\DNC\\DNCLordaeron\\DNCLordaeronTarget\\DNCLordaeronTarget.mdl"), PathSolver.DEFAULT, null); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderDestructable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderDestructable.java index ea02abf..8b442fa 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderDestructable.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/rendersim/RenderDestructable.java @@ -105,6 +105,7 @@ public class RenderDestructable extends RenderDoodad implements RenderWidget { else if (!dead) { if (this.dead) { this.unitAnimationListenerImpl.playAnimation(true, PrimaryTag.BIRTH, SequenceUtils.EMPTY, 1.0f, true); + this.unitAnimationListenerImpl.queueAnimation(PrimaryTag.STAND, SequenceUtils.EMPTY, true); // TODO add back shadow here } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java index 03df186..f27e09f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CSimulation.java @@ -118,11 +118,13 @@ public class CSimulation implements CPlayerAPI { for (int i = 0; i < WarsmashConstants.MAX_PLAYERS; i++) { final CBasePlayer configPlayer = config.getPlayer(i); final War3MapConfigStartLoc startLoc = config.getStartLoc(configPlayer.getStartLocationIndex()); - final CRace defaultRace = CRace.UNDEAD; + final CRace defaultRace = CRace.ORC; final CPlayer newPlayer = new CPlayer(defaultRace, new float[] { startLoc.getX(), startLoc.getY() }, configPlayer); if (WarsmashConstants.LOCAL_TEMP_TEST_ALL_PLAYERS_PLAYING) { - newPlayer.setSlotState(CPlayerSlotState.PLAYING); + if (i < config.getPlayerCount()) { + newPlayer.setSlotState(CPlayerSlotState.PLAYING); + } } this.players.add(newPlayer); } @@ -606,4 +608,11 @@ public class CSimulation implements CPlayerAPI { public boolean isNight() { return !this.daytime; } + + public void updateIsPlaying(final War3MapConfig mapConfig) { + for (int i = 0; i < mapConfig.getPlayerCount(); i++) { + this.players.get(i).setSlotState(CPlayerSlotState.PLAYING); + } + } + } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java index 8051026..2101181 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/CWidget.java @@ -9,6 +9,7 @@ import com.badlogic.gdx.math.Rectangle; import com.etheller.interpreter.ast.scope.GlobalScope; import com.etheller.interpreter.ast.scope.trigger.RemovableTriggerEvent; import com.etheller.interpreter.ast.scope.trigger.Trigger; +import com.etheller.interpreter.ast.util.CHandle; import com.etheller.warsmash.parsers.jass.scope.CommonTriggerExecutionScope; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting.AbilityTarget; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CAttackType; @@ -16,7 +17,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat.CTargetType; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.JassGameEventsWar3; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit.CWidgetEvent; -public abstract class CWidget implements AbilityTarget { +public abstract class CWidget implements AbilityTarget, CHandle { protected static final Rectangle tempRect = new Rectangle(); private final int handleId; private float x; @@ -32,6 +33,7 @@ public abstract class CWidget implements AbilityTarget { this.life = life; } + @Override public int getHandleId() { return this.handleId; } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java index 05cd811..c64765d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/CAbilityView.java @@ -1,5 +1,6 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities; +import com.etheller.interpreter.ast.util.CHandle; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CSimulation; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CUnit; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.CWidget; @@ -7,7 +8,7 @@ import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.targeting import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityActivationReceiver; import com.etheller.warsmash.viewer5.handlers.w3x.simulation.util.AbilityTargetCheckReceiver; -public interface CAbilityView { +public interface CAbilityView extends CHandle { void checkCanUse(CSimulation game, CUnit unit, int orderId, AbilityActivationReceiver receiver); void checkCanTarget(CSimulation game, CUnit unit, int orderId, CWidget target, diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java new file mode 100644 index 0000000..554670f --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/abilities/GetAbilityByRawcodeVisitor.java @@ -0,0 +1,140 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities; + +import com.etheller.warsmash.util.War3ID; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.build.CAbilityBuildInProgress; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.build.CAbilityHumanBuild; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.build.CAbilityNagaBuild; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.build.CAbilityNeutralBuild; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.build.CAbilityNightElfBuild; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.build.CAbilityOrcBuild; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.build.CAbilityUndeadBuild; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.combat.CAbilityColdArrows; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.GenericNoIconAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.generic.GenericSingleIconActiveAbility; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.hero.CAbilityHero; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityQueue; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityRally; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.queue.CAbilityReviveHero; +import com.etheller.warsmash.viewer5.handlers.w3x.simulation.abilities.upgrade.CAbilityUpgrade; + +public class GetAbilityByRawcodeVisitor implements CAbilityVisitor { + private static final GetAbilityByRawcodeVisitor INSTANCE = new GetAbilityByRawcodeVisitor(); + + public static GetAbilityByRawcodeVisitor getInstance() { + return INSTANCE; + } + + private static final War3ID RALLY_RAWCODE = War3ID.fromString("Aral"); + private War3ID rawcode; + + public GetAbilityByRawcodeVisitor reset(final War3ID rawcode) { + this.rawcode = rawcode; + return this; + } + + @Override + public CAbility accept(final CAbilityAttack ability) { + return null; + } + + @Override + public CAbility accept(final CAbilityMove ability) { + return null; + } + + @Override + public CAbility accept(final CAbilityOrcBuild ability) { + return null; + } + + @Override + public CAbility accept(final CAbilityHumanBuild ability) { + return null; + } + + @Override + public CAbility accept(final CAbilityUndeadBuild ability) { + return null; + } + + @Override + public CAbility accept(final CAbilityNightElfBuild ability) { + return null; + } + + @Override + public CAbility accept(final CAbilityGeneric ability) { + if (this.rawcode.equals(ability.getRawcode())) { + return ability; + } + return null; + } + + @Override + public CAbility accept(final CAbilityColdArrows ability) { + if (this.rawcode.equals(ability.getRawcode())) { + return ability; + } + return null; + } + + @Override + public CAbility accept(final CAbilityNagaBuild ability) { + return null; + } + + @Override + public CAbility accept(final CAbilityNeutralBuild ability) { + return null; + } + + @Override + public CAbility accept(final CAbilityBuildInProgress ability) { + return null; + } + + @Override + public CAbility accept(final CAbilityQueue ability) { + return null; + } + + @Override + public CAbility accept(final CAbilityUpgrade ability) { + return null; + } + + @Override + public CAbility accept(final CAbilityReviveHero ability) { + return null; + } + + @Override + public CAbility accept(final GenericSingleIconActiveAbility ability) { + if (this.rawcode.equals(ability.getAlias())) { + return ability; + } + return null; + } + + @Override + public CAbility accept(final CAbilityRally ability) { + if (this.rawcode.equals(RALLY_RAWCODE)) { + return ability; + } + return null; + } + + @Override + public CAbility accept(final GenericNoIconAbility ability) { + if (this.rawcode.equals(ability.getAlias())) { + return ability; + } + return null; + } + + @Override + public CAbility accept(final CAbilityHero ability) { + return null; + } + +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/ai/AIDifficulty.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/ai/AIDifficulty.java index 681f710..779d694 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/ai/AIDifficulty.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/ai/AIDifficulty.java @@ -1,9 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.ai; -public enum AIDifficulty { +import com.etheller.interpreter.ast.util.CHandle; + +public enum AIDifficulty implements CHandle { NEWBIE, NORMAL, INSANE; public static AIDifficulty[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java index cd540b8..1504732 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/combat/CAttackType.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.combat; -public enum CAttackType implements CodeKeyType { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CAttackType implements CodeKeyType, CHandle { UNKNOWN, NORMAL, PIERCE, @@ -43,4 +45,9 @@ public enum CAttackType implements CodeKeyType { } return valueOf(upperCaseAttackType); } + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/item/CItemTypeJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/item/CItemTypeJass.java index bde3174..7cfb8ba 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/item/CItemTypeJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/item/CItemTypeJass.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.item; -public enum CItemTypeJass { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CItemTypeJass implements CHandle { PERMANENT, CHARGED, POWERUP, @@ -12,4 +14,9 @@ public enum CItemTypeJass { ANY; public static CItemTypeJass[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CAllianceType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CAllianceType.java index ea1f28a..61285a5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CAllianceType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CAllianceType.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players; -public enum CAllianceType { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CAllianceType implements CHandle { PASSIVE, HELP_REQUEST, HELP_RESPONSE, @@ -13,4 +15,9 @@ public enum CAllianceType { SHARED_VISION_FORCED; public static CAllianceType[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapControl.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapControl.java index 423e458..2e231a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapControl.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapControl.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players; -public enum CMapControl { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CMapControl implements CHandle { USER, COMPUTER, RESCUABLE, @@ -9,4 +11,9 @@ public enum CMapControl { NONE; public static CMapControl[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapFlag.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapFlag.java index f001bc8..164e3ed 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapFlag.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapFlag.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players; -public enum CMapFlag { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CMapFlag implements CHandle { MAP_FOG_HIDE_TERRAIN, MAP_FOG_MAP_EXPLORED, MAP_FOG_ALWAYS_VISIBLE, @@ -41,4 +43,9 @@ public enum CMapFlag { public int getId() { return 1 << ordinal(); } + + @Override + public int getHandleId() { + return getId(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapPlacement.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapPlacement.java index 29eb00e..e96b458 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapPlacement.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CMapPlacement.java @@ -1,10 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players; -public enum CMapPlacement { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CMapPlacement implements CHandle { RANDOM, FIXED, USE_MAP_SETTINGS, TEAMS_TOGETHER; public static CMapPlacement[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayer.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayer.java index dca7627..5bc9b3e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayer.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayer.java @@ -54,6 +54,7 @@ public class CPlayer extends CBasePlayer { // which fields shouldn't be persisted if we do game state save later private transient CPlayerStateNotifier stateNotifier = new CPlayerStateNotifier(); private float handicapXP; + private float handicap = 0.9f; public CPlayer(final CRace race, final float[] startLocation, final CBasePlayer configPlayer) { super(configPlayer); @@ -410,4 +411,12 @@ public class CPlayer extends CBasePlayer { public float getHandicapXP() { return this.handicapXP; } + + public void setHandicap(final float handicap) { + this.handicap = handicap; + } + + public float getHandicap() { + return this.handicap; + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerColor.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerColor.java index 20cfcf6..0d99690 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerColor.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerColor.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players; -public enum CPlayerColor { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CPlayerColor implements CHandle { RED, BLUE, CYAN, @@ -22,4 +24,9 @@ public enum CPlayerColor { } return null; } + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerGameResult.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerGameResult.java index e713d5c..be55ce9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerGameResult.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerGameResult.java @@ -1,10 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players; -public enum CPlayerGameResult { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CPlayerGameResult implements CHandle { VICTORY, DEFEAT, TIE, NEUTRAL; public static CPlayerGameResult[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerScore.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerScore.java index f0950d8..1b89b71 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerScore.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerScore.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players; -public enum CPlayerScore { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CPlayerScore implements CHandle { UNITS_TRAINED, UNITS_KILLED, STRUCT_BUILT, @@ -28,4 +30,9 @@ public enum CPlayerScore { TOTAL; public static CPlayerScore[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerState.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerState.java index 5da049f..6b3f199 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerState.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CPlayerState.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players; -public enum CPlayerState { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CPlayerState implements CHandle { GAME_RESULT, // current resource levels // @@ -40,4 +42,9 @@ public enum CPlayerState { NO_CREEP_SLEEP; public static CPlayerState[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CRace.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CRace.java index a3f7f04..5a3642b 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CRace.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CRace.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players; -public enum CRace { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CRace implements CHandle { HUMAN(1), ORC(2), UNDEAD(3), @@ -29,4 +31,9 @@ public enum CRace { } return null; } + + @Override + public int getHandleId() { + return getId(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CRacePreference.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CRacePreference.java index 24ff6ac..bc0a07a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CRacePreference.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CRacePreference.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players; -public enum CRacePreference { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CRacePreference implements CHandle { HUMAN, ORC, NIGHTELF, @@ -23,4 +25,9 @@ public enum CRacePreference { public int getId() { return 1 << ordinal(); } + + @Override + public int getHandleId() { + return getId(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CStartLocPrio.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CStartLocPrio.java index 99d7008..82d71f5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CStartLocPrio.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/players/CStartLocPrio.java @@ -1,9 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.players; -public enum CStartLocPrio { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CStartLocPrio implements CHandle { LOW, HIGH, NOT; public static CStartLocPrio[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/region/CRegionTriggerLeave.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/region/CRegionTriggerLeave.java index abf06dc..3927cab 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/region/CRegionTriggerLeave.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/region/CRegionTriggerLeave.java @@ -20,7 +20,7 @@ public class CRegionTriggerLeave { } public void fire(final CUnit unit, final CRegion region) { - if (this.filter.evaluate(this.globalScope, + if ((this.filter == null) || this.filter.evaluate(this.globalScope, CommonTriggerExecutionScope.filterScope(TriggerExecutionScope.EMPTY, unit))) { final CommonTriggerExecutionScope eventScope = CommonTriggerExecutionScope .unitLeaveRegionScope(this.trigger, TriggerExecutionScope.EMPTY, unit, region); diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/state/CGameState.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/state/CGameState.java index 0cad618..5aed112 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/state/CGameState.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/state/CGameState.java @@ -1,9 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.state; -public enum CGameState { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CGameState implements CHandle { DIVINE_INTERVENTION, DISCONNECTED, TIME_OF_DAY; public static CGameState[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/state/CUnitState.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/state/CUnitState.java index 2272ad4..1dd11e9 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/state/CUnitState.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/state/CUnitState.java @@ -1,10 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.state; -public enum CUnitState { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CUnitState implements CHandle { LIFE, MAX_LIFE, MANA, MAX_MANA; public static CUnitState[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/timers/CTimerJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/timers/CTimerJass.java index 8659923..2c4f988 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/timers/CTimerJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/timers/CTimerJass.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.etheller.interpreter.ast.debug.JassException; import com.etheller.interpreter.ast.function.JassFunction; import com.etheller.interpreter.ast.scope.GlobalScope; import com.etheller.interpreter.ast.scope.trigger.Trigger; @@ -25,7 +26,12 @@ public class CTimerJass extends CTimer { @Override public void onFire() { final CommonTriggerExecutionScope handlerScope = CommonTriggerExecutionScope.expiringTimer(null, this); - this.handlerFunc.call(Collections.emptyList(), this.jassGlobalScope, handlerScope); + try { + this.handlerFunc.call(Collections.emptyList(), this.jassGlobalScope, handlerScope); + } + catch (final Exception e) { + throw new JassException(this.jassGlobalScope, "Exception during jass time fire", e); + } for (final Trigger trigger : this.eventTriggers) { final CommonTriggerExecutionScope executionScope = CommonTriggerExecutionScope.expiringTimer(trigger, this); if (trigger.evaluate(this.jassGlobalScope, executionScope)) { diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/JassGameEventsWar3.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/JassGameEventsWar3.java index 0383201..6398646 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/JassGameEventsWar3.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/JassGameEventsWar3.java @@ -1,5 +1,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger; +import com.etheller.interpreter.ast.util.CHandle; + //=================================================== //Game, Player and Unit Events // @@ -15,7 +17,7 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger; // //=================================================== -public enum JassGameEventsWar3 { +public enum JassGameEventsWar3 implements CHandle { // =================================================== // For use with TriggerRegisterGameEvent // =================================================== @@ -245,4 +247,9 @@ public enum JassGameEventsWar3 { } return ordinal; } + + @Override + public int getHandleId() { + return getEventId(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CBlendMode.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CBlendMode.java index 8ea22de..978773f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CBlendMode.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CBlendMode.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CBlendMode { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CBlendMode implements CHandle { NONE, KEYALPHA, BLEND, @@ -9,4 +11,9 @@ public enum CBlendMode { MODULATE_2X; public static CBlendMode[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CCameraField.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CCameraField.java index b51f0a4..8cb8ed5 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CCameraField.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CCameraField.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CCameraField { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CCameraField implements CHandle { TARGET_DISTANCE, FARZ, ANGLE_OF_ATTACK, @@ -10,4 +12,9 @@ public enum CCameraField { ZOFFSET; public static CCameraField[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CDamageType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CDamageType.java index 09c96af..a770b69 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CDamageType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CDamageType.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CDamageType { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CDamageType implements CHandle { UNKNOWN, UNKNOWN_CODE_1, UNKNOWN_CODE_2, @@ -30,4 +32,9 @@ public enum CDamageType { UNIVERSAL; public static CDamageType[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CEffectType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CEffectType.java index 1d02a97..8824d81 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CEffectType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CEffectType.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CEffectType { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CEffectType implements CHandle { EFFECT, TARGET, CASTER, @@ -10,4 +12,9 @@ public enum CEffectType { LIGHTNING; public static CEffectType[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CFogState.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CFogState.java index 4e849f1..e89752f 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CFogState.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CFogState.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CFogState { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CFogState implements CHandle { MASKED, FOGGED, VISIBLE; @@ -19,4 +21,9 @@ public enum CFogState { public int getId() { return 1 << ordinal(); } + + @Override + public int getHandleId() { + return getId(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CGameSpeed.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CGameSpeed.java index ee44d83..dc8d3ae 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CGameSpeed.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CGameSpeed.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CGameSpeed { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CGameSpeed implements CHandle { SLOWEST, SLOW, NORMAL, @@ -8,4 +10,9 @@ public enum CGameSpeed { FASTEST; public static CGameSpeed[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CGameType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CGameType.java index 6c068a3..d0b3923 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CGameType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CGameType.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CGameType { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CGameType implements CHandle { MELEE, FFA, USE_MAP_SETTINGS, @@ -24,4 +26,9 @@ public enum CGameType { public int getId() { return 1 << ordinal(); } + + @Override + public int getHandleId() { + return getId(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CMapDensity.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CMapDensity.java index 0e27016..2104d94 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CMapDensity.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CMapDensity.java @@ -1,10 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CMapDensity { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CMapDensity implements CHandle { NONE, LIGHT, MEDIUM, HEAVY; public static CMapDensity[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CMapDifficulty.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CMapDifficulty.java index 30b1e87..d81081a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CMapDifficulty.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CMapDifficulty.java @@ -1,10 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CMapDifficulty { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CMapDifficulty implements CHandle { EASY, NORMAL, HARD, INSANE; public static CMapDifficulty[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CPathingTypeJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CPathingTypeJass.java index 2e82cbe..bddb87d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CPathingTypeJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CPathingTypeJass.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CPathingTypeJass { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CPathingTypeJass implements CHandle { ANY, WALKABILITY, FLYABILITY, @@ -11,4 +13,9 @@ public enum CPathingTypeJass { AMPHIBIOUSPATHING; public static CPathingTypeJass[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CPlayerSlotState.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CPlayerSlotState.java index e8c219f..9dd9f10 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CPlayerSlotState.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CPlayerSlotState.java @@ -1,9 +1,16 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CPlayerSlotState { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CPlayerSlotState implements CHandle { EMPTY, PLAYING, LEFT; public static CPlayerSlotState[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CRarityControl.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CRarityControl.java index d67015d..320bf1d 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CRarityControl.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CRarityControl.java @@ -1,8 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CRarityControl { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CRarityControl implements CHandle { FREQUENT, RARE; public static CRarityControl[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CSoundType.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CSoundType.java index 14db526..b229183 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CSoundType.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CSoundType.java @@ -1,8 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CSoundType { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CSoundType implements CHandle { EFFECT, EFFECT_LOOPED; public static CSoundType[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CSoundVolumeGroup.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CSoundVolumeGroup.java index 3f22881..115728e 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CSoundVolumeGroup.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CSoundVolumeGroup.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CSoundVolumeGroup { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CSoundVolumeGroup implements CHandle { UNITMOVEMENT, UNITSOUNDS, COMBAT, @@ -11,4 +13,9 @@ public enum CSoundVolumeGroup { FIRE; public static CSoundVolumeGroup[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CTexMapFlags.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CTexMapFlags.java index 10dee18..b77c8c0 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CTexMapFlags.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CTexMapFlags.java @@ -1,10 +1,17 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CTexMapFlags { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CTexMapFlags implements CHandle { NONE, WRAP_U, WRAP_V, WRAP_UV; public static CTexMapFlags[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CVersion.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CVersion.java index 6e8cf22..9976f90 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CVersion.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CVersion.java @@ -1,8 +1,15 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CVersion { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CVersion implements CHandle { REIGN_OF_CHAOS, FROZEN_THRONE; public static CVersion[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CWeaponSoundTypeJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CWeaponSoundTypeJass.java index f3a6b8f..1a5b2a1 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CWeaponSoundTypeJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/trigger/enumtypes/CWeaponSoundTypeJass.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.trigger.enumtypes; -public enum CWeaponSoundTypeJass { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CWeaponSoundTypeJass implements CHandle { WHOKNOWS(null), METAL_LIGHT_CHOP("MetalLightChop"), METAL_MEDIUM_CHOP("MetalMediumChop"), @@ -37,4 +39,9 @@ public enum CWeaponSoundTypeJass { } public static CWeaponSoundTypeJass[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CUnitTypeJass.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CUnitTypeJass.java index 3092f37..ea0d252 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CUnitTypeJass.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/unit/CUnitTypeJass.java @@ -1,6 +1,8 @@ package com.etheller.warsmash.viewer5.handlers.w3x.simulation.unit; -public enum CUnitTypeJass { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CUnitTypeJass implements CHandle { HERO, DEAD, STRUCTURE, @@ -36,4 +38,9 @@ public enum CUnitTypeJass { MAGIC_IMMUNE; public static CUnitTypeJass[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/CHashtable.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/CHashtable.java new file mode 100644 index 0000000..d82b5ea --- /dev/null +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/simulation/util/CHashtable.java @@ -0,0 +1,30 @@ +package com.etheller.warsmash.viewer5.handlers.w3x.simulation.util; + +import java.util.HashMap; +import java.util.Map; + +public class CHashtable { + private final Map> parentKeyToChildTable = new HashMap<>(); + + public void save(final Integer parentKey, final Integer childKey, final Object object) { + Map childTable = this.parentKeyToChildTable.get(parentKey); + if (childTable == null) { + childTable = new HashMap<>(); + this.parentKeyToChildTable.put(parentKey, childTable); + } + if (object == null) { + childTable.remove(childKey); + } + else { + childTable.put(childKey, object); + } + } + + public Object load(final Integer parentKey, final Integer childKey) { + final Map childTable = this.parentKeyToChildTable.get(parentKey); + if (childTable != null) { + return childTable.get(childKey); + } + return null; + } +} diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java index 164ed2b..3b167a4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MeleeUI.java @@ -354,6 +354,7 @@ public class MeleeUI implements CUnitStateListener, CommandButtonListener, Comma private boolean currentMusicRandomizeIndex; private final List timerDialogs = new ArrayList<>(); private final AnyClickableUnitFilter anyClickableUnitFilter; + private final AnyTargetableUnitFilter anyTargetableUnitFilter; public MeleeUI(final DataSource dataSource, final ExtendViewport uiViewport, final Scene uiScene, final Scene portraitScene, final CameraPreset[] cameraPresets, final CameraRates cameraRates, @@ -388,6 +389,7 @@ public class MeleeUI implements CUnitStateListener, CommandButtonListener, Comma this.itemCommandCardCommandListener = new ItemCommandCardCommandListener(); this.anyClickableUnitFilter = new AnyClickableUnitFilter(); + this.anyTargetableUnitFilter = new AnyTargetableUnitFilter(); } private MeleeUIMinimap createMinimap(final War3MapViewer war3MapViewer) { @@ -1644,6 +1646,13 @@ public class MeleeUI implements CUnitStateListener, CommandButtonListener, Comma } } + private final class AnyTargetableUnitFilter implements CWidgetFilterFunction { + @Override + public boolean call(final CWidget unit) { + return !unit.isDead(); + } + } + private final class CursorTargetSetupVisitor implements CAbilityVisitor { private int baseMouseX; private int baseMouseY; @@ -3013,9 +3022,13 @@ public class MeleeUI implements CUnitStateListener, CommandButtonListener, Comma if (button == Input.Buttons.RIGHT) { if ((getSelectedUnit() != null) && (getSelectedUnit().getSimulationUnit() .getPlayerIndex() == this.war3MapViewer.getLocalPlayerIndex())) { - final RenderWidget rayPickUnit = this.war3MapViewer.rayPickUnit(screenX, worldScreenY, + RenderWidget rayPickUnit = this.war3MapViewer.rayPickUnit(screenX, worldScreenY, this.anyClickableUnitFilter); - if ((rayPickUnit != null) && !rayPickUnit.getSimulationWidget().isDead()) { + if (rayPickUnit == null) { + rayPickUnit = this.war3MapViewer.rayPickUnit(screenX, worldScreenY, + this.anyTargetableUnitFilter); + } + if (rayPickUnit != null) { boolean ordered = false; boolean rallied = false; boolean attacked = false; diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MenuUI.java b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MenuUI.java index aac3477..013492a 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MenuUI.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/w3x/ui/MenuUI.java @@ -657,8 +657,8 @@ public class MenuUI { else { turnManager = GameTurnManager.LOCAL; } - final War3MapViewer viewer = new War3MapViewer(codebase, this.screenManager, - new War3MapConfig(WarsmashConstants.MAX_PLAYERS), turnManager); + final War3MapConfig mapConfig = new War3MapConfig(WarsmashConstants.MAX_PLAYERS); + final War3MapViewer viewer = new War3MapViewer(codebase, this.screenManager, mapConfig, turnManager); if (WarsmashGdxMapScreen.ENABLE_AUDIO) { viewer.worldScene.enableAudio(); diff --git a/jassparser/antlr-src/Jass.g4 b/jassparser/antlr-src/Jass.g4 index 7251574..512f817 100644 --- a/jassparser/antlr-src/Jass.g4 +++ b/jassparser/antlr-src/Jass.g4 @@ -98,6 +98,8 @@ baseExpression: | INTEGER #IntegerLiteralExpression | + HEX_CONSTANT #HexIntegerLiteralExpression + | RAWCODE #RawcodeLiteralExpression | REAL #RealLiteralExpression @@ -199,7 +201,7 @@ block: ; functionBlock: - FUNCTION ID TAKES paramList RETURNS type newlines statements ENDFUNCTION newlines + CONSTANT? FUNCTION ID TAKES paramList RETURNS type newlines statements ENDFUNCTION newlines ; statements: @@ -259,14 +261,17 @@ LOOP : 'loop'; ENDLOOP : 'endloop'; EXITWHEN : 'exitwhen'; -STRING_LITERAL : ('"'.*?'"'); - +fragment ESCAPED_QUOTE : '\\"'; +STRING_LITERAL : '"' ( ESCAPED_QUOTE | ~('\n'|'\r') )*? '"'; + INTEGER : [0]|([1-9][0-9]*) ; +HEX_CONSTANT : '0x'(([0-9]|[a-f])*) ; + RAWCODE : ('\''.*?'\''); -REAL : (([0]|([1-9][0-9]*))'.'[0-9]*)|('.'([0]|([1-9][0-9]*))) ; +REAL : (([0]|([1-9][0-9]*))'.'[0-9]*)|('.'([0-9]*)) ; NULL : 'null' ; TRUE : 'true' ; diff --git a/jassparser/src/com/etheller/interpreter/ast/debug/DebuggingJassFunction.java b/jassparser/src/com/etheller/interpreter/ast/debug/DebuggingJassFunction.java new file mode 100644 index 0000000..5c82e9b --- /dev/null +++ b/jassparser/src/com/etheller/interpreter/ast/debug/DebuggingJassFunction.java @@ -0,0 +1,34 @@ +package com.etheller.interpreter.ast.debug; + +import java.util.List; + +import com.etheller.interpreter.ast.function.JassFunction; +import com.etheller.interpreter.ast.scope.GlobalScope; +import com.etheller.interpreter.ast.scope.TriggerExecutionScope; +import com.etheller.interpreter.ast.value.JassValue; + +public class DebuggingJassFunction implements JassFunction { + private final int lineNo; + private final String sourceFile; + private final String functionName; + private final JassFunction delegate; + + public DebuggingJassFunction(final int lineNo, final String sourceFile, final String functionName, + final JassFunction delegate) { + this.lineNo = lineNo; + this.sourceFile = sourceFile; + this.functionName = functionName; + this.delegate = delegate; + } + + @Override + public JassValue call(final List arguments, final GlobalScope globalScope, + final TriggerExecutionScope triggerScope) { + globalScope.pushJassStack(new JassStackElement(this.sourceFile, this.functionName, this.lineNo)); + globalScope.setLineNumber(this.lineNo); + final JassValue returnValue = this.delegate.call(arguments, globalScope, triggerScope); + globalScope.popJassStack(); + return returnValue; + } + +} diff --git a/jassparser/src/com/etheller/interpreter/ast/debug/DebuggingJassStatement.java b/jassparser/src/com/etheller/interpreter/ast/debug/DebuggingJassStatement.java new file mode 100644 index 0000000..c3658d8 --- /dev/null +++ b/jassparser/src/com/etheller/interpreter/ast/debug/DebuggingJassStatement.java @@ -0,0 +1,25 @@ +package com.etheller.interpreter.ast.debug; + +import com.etheller.interpreter.ast.scope.GlobalScope; +import com.etheller.interpreter.ast.scope.LocalScope; +import com.etheller.interpreter.ast.scope.TriggerExecutionScope; +import com.etheller.interpreter.ast.statement.JassStatement; +import com.etheller.interpreter.ast.value.JassValue; + +public class DebuggingJassStatement implements JassStatement { + private final int lineNo; + private final JassStatement delegate; + + public DebuggingJassStatement(final int lineNo, final JassStatement delegate) { + this.lineNo = lineNo; + this.delegate = delegate; + } + + @Override + public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, + final TriggerExecutionScope triggerScope) { + globalScope.setLineNumber(this.lineNo); + return this.delegate.execute(globalScope, localScope, triggerScope); + } + +} diff --git a/jassparser/src/com/etheller/interpreter/ast/debug/JassException.java b/jassparser/src/com/etheller/interpreter/ast/debug/JassException.java new file mode 100644 index 0000000..e582c09 --- /dev/null +++ b/jassparser/src/com/etheller/interpreter/ast/debug/JassException.java @@ -0,0 +1,22 @@ +package com.etheller.interpreter.ast.debug; + +import java.util.List; + +import com.etheller.interpreter.ast.scope.GlobalScope; + +public class JassException extends RuntimeException { + + public JassException(final GlobalScope globalScope, final String message, final Exception javaCause) { + super(message(globalScope, message), javaCause); + } + + private static String message(final GlobalScope globalScope, final String message) { + final List stackTrace = globalScope.copyJassStack(); + final StringBuilder sb = new StringBuilder(message); + for (final JassStackElement element : stackTrace) { + sb.append("\n"); + sb.append(element); + } + return sb.toString(); + } +} diff --git a/jassparser/src/com/etheller/interpreter/ast/debug/JassStackElement.java b/jassparser/src/com/etheller/interpreter/ast/debug/JassStackElement.java new file mode 100644 index 0000000..e9bdd09 --- /dev/null +++ b/jassparser/src/com/etheller/interpreter/ast/debug/JassStackElement.java @@ -0,0 +1,38 @@ +package com.etheller.interpreter.ast.debug; + +public class JassStackElement { + private final String sourceFile; + private final String functionName; + private int lineNumber; + + public JassStackElement(final String sourceFile, final String functionName, final int lineNumber) { + this.sourceFile = sourceFile; + this.functionName = functionName; + this.lineNumber = lineNumber; + } + + public JassStackElement(final JassStackElement other) { + this(other.sourceFile, other.functionName, other.lineNumber); + } + + public String getSourceFile() { + return this.sourceFile; + } + + public String getFunctionName() { + return this.functionName; + } + + public int getLineNumber() { + return this.lineNumber; + } + + public void setLineNumber(final int lineNumber) { + this.lineNumber = lineNumber; + } + + @Override + public String toString() { + return "\tat " + this.functionName + "(" + this.sourceFile + ":" + +this.lineNumber + ")"; + } +} diff --git a/jassparser/src/com/etheller/interpreter/ast/expression/ArithmeticSigns.java b/jassparser/src/com/etheller/interpreter/ast/expression/ArithmeticSigns.java index 61b2d43..32381ad 100644 --- a/jassparser/src/com/etheller/interpreter/ast/expression/ArithmeticSigns.java +++ b/jassparser/src/com/etheller/interpreter/ast/expression/ArithmeticSigns.java @@ -283,17 +283,17 @@ public enum ArithmeticSigns implements ArithmeticSign { @Override public BooleanJassValue apply(final String left, final String right) { - return BooleanJassValue.of(equals(left, right)); + return BooleanJassValue.of(isEqual(left, right)); } @Override public BooleanJassValue apply(final HandleJassValue left, final HandleJassValue right) { - return BooleanJassValue.of(equals(left, right)); + return BooleanJassValue.of(isEqual(left, right)); } @Override public BooleanJassValue apply(final CodeJassValue left, final CodeJassValue right) { - return BooleanJassValue.of(equals(left, right)); + return BooleanJassValue.of(isEqual(left, right)); } }, NOT_EQUALS() { @@ -324,17 +324,17 @@ public enum ArithmeticSigns implements ArithmeticSign { @Override public JassValue apply(final String left, final String right) { - return BooleanJassValue.of(!equals(left, right)); + return BooleanJassValue.of(!isEqual(left, right)); } @Override public JassValue apply(final HandleJassValue left, final HandleJassValue right) { - return BooleanJassValue.of(!equals(left, right)); + return BooleanJassValue.of(!isEqual(left, right)); } @Override public BooleanJassValue apply(final CodeJassValue left, final CodeJassValue right) { - return BooleanJassValue.of(!equals(left, right)); + return BooleanJassValue.of(!isEqual(left, right)); } }, LESS() { @@ -502,7 +502,7 @@ public enum ArithmeticSigns implements ArithmeticSign { } }; - private static boolean equals(final String left, final String right) { + private static boolean isEqual(final String left, final String right) { boolean equals; if (left == null) { if (right == null) { @@ -518,11 +518,11 @@ public enum ArithmeticSigns implements ArithmeticSign { return equals; } - private static boolean equals(final HandleJassValue left, final HandleJassValue right) { + private static boolean isEqual(final HandleJassValue left, final HandleJassValue right) { return (left.getJavaValue() == right.getJavaValue()) && (left.getType() == right.getType()); } - private static boolean equals(final CodeJassValue left, final CodeJassValue right) { + private static boolean isEqual(final CodeJassValue left, final CodeJassValue right) { return (left.getValue() == right.getValue()); } } diff --git a/jassparser/src/com/etheller/interpreter/ast/function/AbstractJassFunction.java b/jassparser/src/com/etheller/interpreter/ast/function/AbstractJassFunction.java index af9107f..2e5ae75 100644 --- a/jassparser/src/com/etheller/interpreter/ast/function/AbstractJassFunction.java +++ b/jassparser/src/com/etheller/interpreter/ast/function/AbstractJassFunction.java @@ -35,6 +35,12 @@ public abstract class AbstractJassFunction implements JassFunction { final JassParameter parameter = this.parameters.get(i); final JassValue argument = arguments.get(i); if (!parameter.matchesType(argument)) { + if ((parameter == null) || (argument == null)) { + System.err.println( + "Returning null because we called some Jass function with incorrect argument types, and the types were null!!!"); + System.err.println("This is a temporary hack for tests and showcase programming solutions"); + return null; + } System.err.println( parameter.getType() + " != " + argument.visit(JassTypeGettingValueVisitor.getInstance())); throw new RuntimeException( diff --git a/jassparser/src/com/etheller/interpreter/ast/function/JassNativeManager.java b/jassparser/src/com/etheller/interpreter/ast/function/JassNativeManager.java index 931c918..d26f3d6 100644 --- a/jassparser/src/com/etheller/interpreter/ast/function/JassNativeManager.java +++ b/jassparser/src/com/etheller/interpreter/ast/function/JassNativeManager.java @@ -21,13 +21,14 @@ public class JassNativeManager { this.nameToNativeCode.put(name, nativeCode); } - public void registerNativeCode(final String name, final List parameters, final JassType returnType, - final GlobalScope globals) { + public void registerNativeCode(final int lineNo, final String sourceFile, final String name, + final List parameters, final JassType returnType, final GlobalScope globals) { if (this.registeredNativeNames.contains(name)) { throw new RuntimeException("Native already registered: " + name); } final JassFunction nativeCode = this.nameToNativeCode.remove(name); - globals.defineFunction(name, new NativeJassFunction(parameters, returnType, name, nativeCode)); + globals.defineFunction(lineNo, sourceFile, name, + new NativeJassFunction(parameters, returnType, name, nativeCode)); this.registeredNativeNames.add(name); } diff --git a/jassparser/src/com/etheller/interpreter/ast/scope/GlobalScope.java b/jassparser/src/com/etheller/interpreter/ast/scope/GlobalScope.java index 7063203..cc3200b 100644 --- a/jassparser/src/com/etheller/interpreter/ast/scope/GlobalScope.java +++ b/jassparser/src/com/etheller/interpreter/ast/scope/GlobalScope.java @@ -1,14 +1,21 @@ package com.etheller.interpreter.ast.scope; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; import java.util.HashMap; +import java.util.List; import java.util.Map; import com.etheller.interpreter.ast.Assignable; +import com.etheller.interpreter.ast.debug.DebuggingJassFunction; +import com.etheller.interpreter.ast.debug.JassStackElement; import com.etheller.interpreter.ast.function.JassFunction; import com.etheller.interpreter.ast.scope.trigger.RemovableTriggerEvent; import com.etheller.interpreter.ast.scope.trigger.Trigger; import com.etheller.interpreter.ast.scope.variableevent.CLimitOp; import com.etheller.interpreter.ast.scope.variableevent.VariableEvent; +import com.etheller.interpreter.ast.util.JassSettings; import com.etheller.interpreter.ast.value.ArrayJassType; import com.etheller.interpreter.ast.value.ArrayJassValue; import com.etheller.interpreter.ast.value.HandleJassType; @@ -27,7 +34,7 @@ public final class GlobalScope { public final HandleJassType handleType; - private static int lineNumber; + private final ArrayDeque jassStack = new ArrayDeque<>(); public GlobalScope() { this.handleType = registerHandleType("handle");// the handle type @@ -39,12 +46,39 @@ public final class GlobalScope { registerPrimitiveType(JassType.STRING); } - public static void setLineNumber(final int lineNo) { - lineNumber = lineNo; + public Deque getJassStack() { + return this.jassStack; } - public static int getLineNumber() { - return lineNumber; + public List copyJassStack() { + final List copiedStack = new ArrayList<>(); + for (final JassStackElement stackElement : this.jassStack) { + copiedStack.add(new JassStackElement(stackElement)); + } + return copiedStack; + } + + public void pushJassStack(final JassStackElement element) { + this.jassStack.push(element); + } + + public void popJassStack() { + this.jassStack.pop(); + } + + public void setLineNumber(final int lineNo) { + final JassStackElement top = this.jassStack.peekFirst(); + if (top != null) { + top.setLineNumber(lineNo); + } + } + + public int getLineNumber() { + final JassStackElement top = this.jassStack.peekFirst(); + if (top != null) { + return top.getLineNumber(); + } + return -1; } public HandleJassType registerHandleType(final String name) { @@ -101,8 +135,14 @@ public final class GlobalScope { return this.globals.get(name); } - public void defineFunction(final String name, final JassFunction function) { - this.functions.put(name, function); + public void defineFunction(final int lineNo, final String sourceFile, final String name, + final JassFunction function) { + if (JassSettings.DEBUG) { + this.functions.put(name, new DebuggingJassFunction(lineNo, sourceFile, name, function)); + } + else { + this.functions.put(name, function); + } } public JassFunction getFunctionByName(final String name) { diff --git a/jassparser/src/com/etheller/interpreter/ast/scope/trigger/Trigger.java b/jassparser/src/com/etheller/interpreter/ast/scope/trigger/Trigger.java index 81c103a..6a04406 100644 --- a/jassparser/src/com/etheller/interpreter/ast/scope/trigger/Trigger.java +++ b/jassparser/src/com/etheller/interpreter/ast/scope/trigger/Trigger.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.etheller.interpreter.ast.debug.JassException; import com.etheller.interpreter.ast.function.JassFunction; import com.etheller.interpreter.ast.scope.GlobalScope; import com.etheller.interpreter.ast.scope.TriggerExecutionScope; @@ -60,7 +61,12 @@ public class Trigger { return; } for (final JassFunction action : this.actions) { - action.call(Collections.emptyList(), globalScope, triggerScope); + try { + action.call(Collections.emptyList(), globalScope, triggerScope); + } + catch (final Exception e) { + throw new JassException(globalScope, "Exception during Trigger action execute", e); + } } } diff --git a/jassparser/src/com/etheller/interpreter/ast/scope/variableevent/CLimitOp.java b/jassparser/src/com/etheller/interpreter/ast/scope/variableevent/CLimitOp.java index ca34cbc..d637031 100644 --- a/jassparser/src/com/etheller/interpreter/ast/scope/variableevent/CLimitOp.java +++ b/jassparser/src/com/etheller/interpreter/ast/scope/variableevent/CLimitOp.java @@ -1,6 +1,8 @@ package com.etheller.interpreter.ast.scope.variableevent; -public enum CLimitOp { +import com.etheller.interpreter.ast.util.CHandle; + +public enum CLimitOp implements CHandle { LESS_THAN, LESS_THAN_OR_EQUAL, EQUAL, @@ -9,4 +11,9 @@ public enum CLimitOp { NOT_EQUAL; public static CLimitOp[] VALUES = values(); + + @Override + public int getHandleId() { + return ordinal(); + } } diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassArrayedAssignmentStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassArrayedAssignmentStatement.java index 5b80156..5f42db8 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassArrayedAssignmentStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassArrayedAssignmentStatement.java @@ -14,11 +14,9 @@ public class JassArrayedAssignmentStatement implements JassStatement { private final String identifier; private final JassExpression indexExpression; private final JassExpression expression; - private final int lineNo; - public JassArrayedAssignmentStatement(final int lineNo, final String identifier, - final JassExpression indexExpression, final JassExpression expression) { - this.lineNo = lineNo; + public JassArrayedAssignmentStatement(final String identifier, final JassExpression indexExpression, + final JassExpression expression) { this.identifier = identifier; this.indexExpression = indexExpression; this.expression = expression; @@ -27,7 +25,6 @@ public class JassArrayedAssignmentStatement implements JassStatement { @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); Assignable variable = localScope.getAssignableLocal(this.identifier); final JassValue index = this.indexExpression.evaluate(globalScope, localScope, triggerScope); if (variable == null) { diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassCallStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassCallStatement.java index a5e9635..a19ddd4 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassCallStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassCallStatement.java @@ -11,12 +11,10 @@ import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.interpreter.ast.value.JassValue; public class JassCallStatement implements JassStatement { - private final int lineNo; private final String functionName; private final List arguments; - public JassCallStatement(final int lineNo, final String functionName, final List arguments) { - this.lineNo = lineNo; + public JassCallStatement(final String functionName, final List arguments) { this.functionName = functionName; this.arguments = arguments; } @@ -24,7 +22,6 @@ public class JassCallStatement implements JassStatement { @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); final JassFunction functionByName = globalScope.getFunctionByName(this.functionName); if (functionByName == null) { throw new RuntimeException("Undefined function: " + this.functionName); diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassExitWhenStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassExitWhenStatement.java index f6fdd0e..4b86268 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassExitWhenStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassExitWhenStatement.java @@ -10,18 +10,15 @@ import com.etheller.interpreter.ast.value.visitor.BooleanJassValueVisitor; public class JassExitWhenStatement implements JassStatement { public static final StringJassValue LOOP_EXIT_NOTICE = new StringJassValue("EXIT"); - private final int lineNo; private final JassExpression expression; - public JassExitWhenStatement(final int lineNo, final JassExpression expression) { - this.lineNo = lineNo; + public JassExitWhenStatement(final JassExpression expression) { this.expression = expression; } @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); if (this.expression.evaluate(globalScope, localScope, triggerScope) .visit(BooleanJassValueVisitor.getInstance())) { return LOOP_EXIT_NOTICE; diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassIfElseIfStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassIfElseIfStatement.java index 5f1f208..d42eaf4 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassIfElseIfStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassIfElseIfStatement.java @@ -10,14 +10,12 @@ import com.etheller.interpreter.ast.value.JassValue; import com.etheller.interpreter.ast.value.visitor.BooleanJassValueVisitor; public class JassIfElseIfStatement implements JassStatement { - private final int lineNo; private final JassExpression condition; private final List thenStatements; private final JassStatement elseifTail; - public JassIfElseIfStatement(final int lineNo, final JassExpression condition, - final List thenStatements, final JassStatement elseifTail) { - this.lineNo = lineNo; + public JassIfElseIfStatement(final JassExpression condition, final List thenStatements, + final JassStatement elseifTail) { this.condition = condition; this.thenStatements = thenStatements; this.elseifTail = elseifTail; @@ -26,7 +24,6 @@ public class JassIfElseIfStatement implements JassStatement { @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); if (this.condition.evaluate(globalScope, localScope, triggerScope) .visit(BooleanJassValueVisitor.getInstance())) { for (final JassStatement statement : this.thenStatements) { diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassIfElseStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassIfElseStatement.java index 20b9719..cfa67a4 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassIfElseStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassIfElseStatement.java @@ -10,14 +10,12 @@ import com.etheller.interpreter.ast.value.JassValue; import com.etheller.interpreter.ast.value.visitor.BooleanJassValueVisitor; public class JassIfElseStatement implements JassStatement { - private final int lineNo; private final JassExpression condition; private final List thenStatements; private final List elseStatements; - public JassIfElseStatement(final int lineNo, final JassExpression condition, - final List thenStatements, final List elseStatements) { - this.lineNo = lineNo; + public JassIfElseStatement(final JassExpression condition, final List thenStatements, + final List elseStatements) { this.condition = condition; this.thenStatements = thenStatements; this.elseStatements = elseStatements; @@ -26,7 +24,6 @@ public class JassIfElseStatement implements JassStatement { @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); if (this.condition.evaluate(globalScope, localScope, triggerScope) .visit(BooleanJassValueVisitor.getInstance())) { for (final JassStatement statement : this.thenStatements) { diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassIfStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassIfStatement.java index 8ef37d0..7293bb1 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassIfStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassIfStatement.java @@ -10,12 +10,10 @@ import com.etheller.interpreter.ast.value.JassValue; import com.etheller.interpreter.ast.value.visitor.BooleanJassValueVisitor; public class JassIfStatement implements JassStatement { - private final int lineNo; private final JassExpression condition; private final List thenStatements; - public JassIfStatement(final int lineNo, final JassExpression condition, final List thenStatements) { - this.lineNo = lineNo; + public JassIfStatement(final JassExpression condition, final List thenStatements) { this.condition = condition; this.thenStatements = thenStatements; } @@ -31,7 +29,6 @@ public class JassIfStatement implements JassStatement { @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); final JassValue evaluate = this.condition.evaluate(globalScope, localScope, triggerScope); // TODO this null is here for simulations where we are missing natives, remove // it on full release diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassLocalDefinitionStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassLocalDefinitionStatement.java index 2b96f48..daf8298 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassLocalDefinitionStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassLocalDefinitionStatement.java @@ -10,12 +10,9 @@ import com.etheller.interpreter.ast.value.JassValue; public class JassLocalDefinitionStatement implements JassStatement { private final String identifier; private final JassExpression expression; - private final int lineNo; private final JassType type; - public JassLocalDefinitionStatement(final int lineNo, final String identifier, final JassType type, - final JassExpression expression) { - this.lineNo = lineNo; + public JassLocalDefinitionStatement(final String identifier, final JassType type, final JassExpression expression) { this.identifier = identifier; this.type = type; this.expression = expression; @@ -24,7 +21,6 @@ public class JassLocalDefinitionStatement implements JassStatement { @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); localScope.createLocal(this.identifier, this.type, this.expression.evaluate(globalScope, localScope, triggerScope)); return null; diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassLocalStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassLocalStatement.java index 448aa27..7823bfa 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassLocalStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassLocalStatement.java @@ -3,16 +3,15 @@ package com.etheller.interpreter.ast.statement; import com.etheller.interpreter.ast.scope.GlobalScope; import com.etheller.interpreter.ast.scope.LocalScope; import com.etheller.interpreter.ast.scope.TriggerExecutionScope; +import com.etheller.interpreter.ast.value.IntegerJassValue; import com.etheller.interpreter.ast.value.JassType; import com.etheller.interpreter.ast.value.JassValue; public class JassLocalStatement implements JassStatement { private final String identifier; - private final int lineNo; private final JassType type; - public JassLocalStatement(final int lineNo, final String identifier, final JassType type) { - this.lineNo = lineNo; + public JassLocalStatement(final String identifier, final JassType type) { this.identifier = identifier; this.type = type; } @@ -20,8 +19,12 @@ public class JassLocalStatement implements JassStatement { @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); - localScope.createLocal(this.identifier, this.type); + if (this.type == JassType.INTEGER) { + localScope.createLocal(this.identifier, this.type, IntegerJassValue.ZERO); + } + else { + localScope.createLocal(this.identifier, this.type); + } return null; } diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassLoopStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassLoopStatement.java index a402d86..2f7f81e 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassLoopStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassLoopStatement.java @@ -8,18 +8,15 @@ import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.interpreter.ast.value.JassValue; public class JassLoopStatement implements JassStatement { - private final int lineNo; private final List statements; - public JassLoopStatement(final int lineNo, final List statements) { - this.lineNo = lineNo; + public JassLoopStatement(final List statements) { this.statements = statements; } @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); while (true) { for (final JassStatement statement : this.statements) { final JassValue returnValue = statement.execute(globalScope, localScope, triggerScope); diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassReturnNothingStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassReturnNothingStatement.java index ee96f44..16b6d75 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassReturnNothingStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassReturnNothingStatement.java @@ -8,16 +8,10 @@ import com.etheller.interpreter.ast.value.StringJassValue; public class JassReturnNothingStatement implements JassStatement { public static final StringJassValue RETURN_NOTHING_NOTICE = new StringJassValue("nothing"); - private final int lineNo; - - public JassReturnNothingStatement(final int lineNo) { - this.lineNo = lineNo; - } @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); return RETURN_NOTHING_NOTICE; } diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassReturnStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassReturnStatement.java index adb1b4e..3a4e6a7 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassReturnStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassReturnStatement.java @@ -7,18 +7,15 @@ import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.interpreter.ast.value.JassValue; public class JassReturnStatement implements JassStatement { - private final int lineNo; private final JassExpression expression; - public JassReturnStatement(final int lineNo, final JassExpression expression) { - this.lineNo = lineNo; + public JassReturnStatement(final JassExpression expression) { this.expression = expression; } @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); return this.expression.evaluate(globalScope, localScope, triggerScope); } diff --git a/jassparser/src/com/etheller/interpreter/ast/statement/JassSetStatement.java b/jassparser/src/com/etheller/interpreter/ast/statement/JassSetStatement.java index e8249d4..bd914b5 100644 --- a/jassparser/src/com/etheller/interpreter/ast/statement/JassSetStatement.java +++ b/jassparser/src/com/etheller/interpreter/ast/statement/JassSetStatement.java @@ -8,12 +8,10 @@ import com.etheller.interpreter.ast.scope.TriggerExecutionScope; import com.etheller.interpreter.ast.value.JassValue; public class JassSetStatement implements JassStatement { - private final int lineNo; private final String identifier; private final JassExpression expression; - public JassSetStatement(final int lineNo, final String identifier, final JassExpression expression) { - this.lineNo = lineNo; + public JassSetStatement(final String identifier, final JassExpression expression) { this.identifier = identifier; this.expression = expression; } @@ -21,7 +19,6 @@ public class JassSetStatement implements JassStatement { @Override public JassValue execute(final GlobalScope globalScope, final LocalScope localScope, final TriggerExecutionScope triggerScope) { - globalScope.setLineNumber(this.lineNo); final Assignable local = localScope.getAssignableLocal(this.identifier); if (local != null) { local.setValue(this.expression.evaluate(globalScope, localScope, triggerScope)); diff --git a/jassparser/src/com/etheller/interpreter/ast/util/CHandle.java b/jassparser/src/com/etheller/interpreter/ast/util/CHandle.java new file mode 100644 index 0000000..62b3b70 --- /dev/null +++ b/jassparser/src/com/etheller/interpreter/ast/util/CHandle.java @@ -0,0 +1,5 @@ +package com.etheller.interpreter.ast.util; + +public interface CHandle { + int getHandleId(); +} diff --git a/jassparser/src/com/etheller/interpreter/ast/util/JassSettings.java b/jassparser/src/com/etheller/interpreter/ast/util/JassSettings.java new file mode 100644 index 0000000..a000c78 --- /dev/null +++ b/jassparser/src/com/etheller/interpreter/ast/util/JassSettings.java @@ -0,0 +1,5 @@ +package com.etheller.interpreter.ast.util; + +public class JassSettings { + public static boolean DEBUG = true; +} diff --git a/jassparser/src/com/etheller/interpreter/ast/value/ArrayJassValue.java b/jassparser/src/com/etheller/interpreter/ast/value/ArrayJassValue.java index 2a33879..dbff226 100644 --- a/jassparser/src/com/etheller/interpreter/ast/value/ArrayJassValue.java +++ b/jassparser/src/com/etheller/interpreter/ast/value/ArrayJassValue.java @@ -1,5 +1,7 @@ package com.etheller.interpreter.ast.value; +import java.util.Arrays; + import com.etheller.interpreter.ast.value.visitor.JassTypeGettingValueVisitor; public class ArrayJassValue implements JassValue { @@ -8,6 +10,21 @@ public class ArrayJassValue implements JassValue { public ArrayJassValue(final ArrayJassType type) { this.type = type; + final JassType primitiveType = this.type.getPrimitiveType(); + + // Some default values for primitives... in general seems like the user script + // should already do this, so maybe we could take it out for performance later, + // but at the moment it's only a cost when we create a new array (local array) + // which is rare. Anyway, preallocating arrays to size 8192 is very stupid. + if (primitiveType == JassType.INTEGER) { + Arrays.fill(this.data, IntegerJassValue.ZERO); + } + else if (primitiveType == JassType.REAL) { + Arrays.fill(this.data, RealJassValue.ZERO); + } + else if (primitiveType == JassType.BOOLEAN) { + Arrays.fill(this.data, BooleanJassValue.FALSE); + } } @Override diff --git a/jassparser/src/com/etheller/interpreter/ast/value/HandleJassValue.java b/jassparser/src/com/etheller/interpreter/ast/value/HandleJassValue.java index 78032fd..1ffd195 100644 --- a/jassparser/src/com/etheller/interpreter/ast/value/HandleJassValue.java +++ b/jassparser/src/com/etheller/interpreter/ast/value/HandleJassValue.java @@ -22,4 +22,9 @@ public class HandleJassValue implements JassValue { return visitor.accept(this); } + @Override + public String toString() { + return this.type.getName() + ":" + this.javaValue; + } + } diff --git a/jassparser/src/com/etheller/interpreter/ast/value/IntegerJassValue.java b/jassparser/src/com/etheller/interpreter/ast/value/IntegerJassValue.java index e8953c8..8eb4bc8 100644 --- a/jassparser/src/com/etheller/interpreter/ast/value/IntegerJassValue.java +++ b/jassparser/src/com/etheller/interpreter/ast/value/IntegerJassValue.java @@ -1,6 +1,7 @@ package com.etheller.interpreter.ast.value; public class IntegerJassValue implements JassValue { + public static final JassValue ZERO = new IntegerJassValue(0); private final int value; public IntegerJassValue(final int value) { diff --git a/jassparser/src/com/etheller/interpreter/ast/value/RealJassValue.java b/jassparser/src/com/etheller/interpreter/ast/value/RealJassValue.java index 5340fbb..0dcde87 100644 --- a/jassparser/src/com/etheller/interpreter/ast/value/RealJassValue.java +++ b/jassparser/src/com/etheller/interpreter/ast/value/RealJassValue.java @@ -1,6 +1,7 @@ package com.etheller.interpreter.ast.value; public class RealJassValue implements JassValue { + public static final JassValue ZERO = new RealJassValue(0); private final double value; public RealJassValue(final double value) { diff --git a/jassparser/src/com/etheller/interpreter/ast/value/StringJassValue.java b/jassparser/src/com/etheller/interpreter/ast/value/StringJassValue.java index 9cbcbb8..87b3aae 100644 --- a/jassparser/src/com/etheller/interpreter/ast/value/StringJassValue.java +++ b/jassparser/src/com/etheller/interpreter/ast/value/StringJassValue.java @@ -1,6 +1,7 @@ package com.etheller.interpreter.ast.value; public class StringJassValue implements JassValue { + public static final JassValue EMPTY_STRING = StringJassValue.of(""); private final String value; public static StringJassValue of(final String value) { diff --git a/jassparser/src/com/etheller/interpreter/ast/visitors/JassExpressionVisitor.java b/jassparser/src/com/etheller/interpreter/ast/visitors/JassExpressionVisitor.java index 2c52f30..15900fe 100644 --- a/jassparser/src/com/etheller/interpreter/ast/visitors/JassExpressionVisitor.java +++ b/jassparser/src/com/etheller/interpreter/ast/visitors/JassExpressionVisitor.java @@ -18,6 +18,7 @@ import com.etheller.interpreter.JassParser.EqualsExpressionContext; import com.etheller.interpreter.JassParser.FalseExpressionContext; import com.etheller.interpreter.JassParser.FunctionCallExpressionContext; import com.etheller.interpreter.JassParser.FunctionReferenceExpressionContext; +import com.etheller.interpreter.JassParser.HexIntegerLiteralExpressionContext; import com.etheller.interpreter.JassParser.IntegerLiteralExpressionContext; import com.etheller.interpreter.JassParser.MultiplicationExpressionContext; import com.etheller.interpreter.JassParser.NegateExpressionContext; @@ -77,6 +78,12 @@ public class JassExpressionVisitor extends JassBaseVisitor { return new LiteralJassExpression(new IntegerJassValue(Integer.parseInt(ctx.INTEGER().getText()))); } + @Override + public JassExpression visitHexIntegerLiteralExpression(final HexIntegerLiteralExpressionContext ctx) { + return new LiteralJassExpression( + new IntegerJassValue(Integer.parseInt(ctx.HEX_CONSTANT().getText().substring(2), 16))); + } + @Override public JassExpression visitRawcodeLiteralExpression(final RawcodeLiteralExpressionContext ctx) { final String stringLiteralText = ctx.RAWCODE().getText(); diff --git a/jassparser/src/com/etheller/interpreter/ast/visitors/JassProgramVisitor.java b/jassparser/src/com/etheller/interpreter/ast/visitors/JassProgramVisitor.java index 59a2a95..e107a38 100644 --- a/jassparser/src/com/etheller/interpreter/ast/visitors/JassProgramVisitor.java +++ b/jassparser/src/com/etheller/interpreter/ast/visitors/JassProgramVisitor.java @@ -1,7 +1,6 @@ package com.etheller.interpreter.ast.visitors; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import com.etheller.interpreter.JassBaseVisitor; @@ -11,7 +10,6 @@ import com.etheller.interpreter.JassParser.GlobalContext; import com.etheller.interpreter.JassParser.ProgramContext; import com.etheller.interpreter.JassParser.StatementContext; import com.etheller.interpreter.JassParser.TypeDefinitionContext; -import com.etheller.interpreter.ast.function.JassFunction; import com.etheller.interpreter.ast.function.JassNativeManager; import com.etheller.interpreter.ast.function.UserJassFunction; import com.etheller.interpreter.ast.scope.GlobalScope; @@ -36,6 +34,7 @@ public class JassProgramVisitor extends JassBaseVisitor { private final JassParametersVisitor jassParametersVisitor = new JassParametersVisitor(this.jassTypeVisitor); private final JassStatementVisitor jassStatementVisitor = new JassStatementVisitor(this.argumentExpressionHandler, this.jassTypeVisitor); + private String jassFileName; @Override public Void visitBlock(final BlockContext ctx) { @@ -47,7 +46,7 @@ public class JassProgramVisitor extends JassBaseVisitor { else if (ctx.nativeBlock() != null) { final String text = ctx.nativeBlock().ID().getText(); System.out.println("Registering native: " + text); - this.jassNativeManager.registerNativeCode(text, + this.jassNativeManager.registerNativeCode(ctx.getStart().getLine(), this.jassFileName, text, this.jassParametersVisitor.visit(ctx.nativeBlock().paramList()), this.jassTypeVisitor.visit(ctx.nativeBlock().type()), this.globals); } @@ -62,7 +61,7 @@ public class JassProgramVisitor extends JassBaseVisitor { } final UserJassFunction userJassFunction = new UserJassFunction(statements, this.jassParametersVisitor.visit(ctx.paramList()), this.jassTypeVisitor.visit(ctx.type())); - this.globals.defineFunction(ctx.ID().getText(), userJassFunction); + this.globals.defineFunction(ctx.getStart().getLine(), this.jassFileName, ctx.ID().getText(), userJassFunction); return null; } @@ -83,16 +82,9 @@ public class JassProgramVisitor extends JassBaseVisitor { final UserJassFunction userJassFunction = new UserJassFunction(statements, this.jassParametersVisitor.visit(functionBlockContext.paramList()), this.jassTypeVisitor.visit(functionBlockContext.type())); - this.globals.defineFunction(functionBlockContext.ID().getText(), userJassFunction); - } - final JassFunction mainFunction = this.globals.getFunctionByName("main"); - if (mainFunction != null) { - try { - mainFunction.call(Collections.EMPTY_LIST, this.globals, EMPTY_TRIGGER_SCOPE); - } - catch (final Exception exc) { - throw new RuntimeException("Exception on Line " + GlobalScope.getLineNumber(), exc); - } + this.globals.defineFunction(ctx.getStart().getLine(), this.jassFileName, + functionBlockContext.ID().getText(), userJassFunction); + System.out.println("Defining jass user function: " + functionBlockContext.ID().getText()); } return null; } @@ -104,4 +96,9 @@ public class JassProgramVisitor extends JassBaseVisitor { public JassNativeManager getJassNativeManager() { return this.jassNativeManager; } + + public void setCurrentFileName(final String jassFile) { + this.jassFileName = jassFile; + this.jassStatementVisitor.setCurrentFileName(jassFile); + } } diff --git a/jassparser/src/com/etheller/interpreter/ast/visitors/JassStatementVisitor.java b/jassparser/src/com/etheller/interpreter/ast/visitors/JassStatementVisitor.java index cbffaa0..7d1eb13 100644 --- a/jassparser/src/com/etheller/interpreter/ast/visitors/JassStatementVisitor.java +++ b/jassparser/src/com/etheller/interpreter/ast/visitors/JassStatementVisitor.java @@ -17,6 +17,7 @@ import com.etheller.interpreter.JassParser.ReturnStatementContext; import com.etheller.interpreter.JassParser.SetStatementContext; import com.etheller.interpreter.JassParser.SimpleIfStatementContext; import com.etheller.interpreter.JassParser.StatementContext; +import com.etheller.interpreter.ast.debug.DebuggingJassStatement; import com.etheller.interpreter.ast.statement.JassArrayedAssignmentStatement; import com.etheller.interpreter.ast.statement.JassCallStatement; import com.etheller.interpreter.ast.statement.JassExitWhenStatement; @@ -30,10 +31,12 @@ import com.etheller.interpreter.ast.statement.JassReturnNothingStatement; import com.etheller.interpreter.ast.statement.JassReturnStatement; import com.etheller.interpreter.ast.statement.JassSetStatement; import com.etheller.interpreter.ast.statement.JassStatement; +import com.etheller.interpreter.ast.util.JassSettings; public class JassStatementVisitor extends JassBaseVisitor { private final ArgumentExpressionHandler argumentExpressionHandler; private final JassTypeVisitor jassTypeVisitor; + private String jassFileName; public JassStatementVisitor(final ArgumentExpressionHandler argumentExpressionHandler, final JassTypeVisitor jassTypeVisitor) { @@ -44,8 +47,8 @@ public class JassStatementVisitor extends JassBaseVisitor { @Override public JassStatement visitCallStatement(final CallStatementContext ctx) { try { - return new JassCallStatement(ctx.getStart().getLine(), ctx.functionExpression().ID().getText(), - this.argumentExpressionHandler.argumentsVisitor.visit(ctx.functionExpression().argsList())); + return wrap(ctx.getStart().getLine(), new JassCallStatement(ctx.functionExpression().ID().getText(), + this.argumentExpressionHandler.argumentsVisitor.visit(ctx.functionExpression().argsList()))); } catch (final Exception exc) { throw new RuntimeException(ctx.getText(), exc); @@ -54,25 +57,25 @@ public class JassStatementVisitor extends JassBaseVisitor { @Override public JassStatement visitSetStatement(final SetStatementContext ctx) { - return new JassSetStatement(ctx.getStart().getLine(), ctx.ID().getText(), - this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression())); + return wrap(ctx.getStart().getLine(), new JassSetStatement(ctx.ID().getText(), + this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression()))); } @Override public JassStatement visitReturnStatement(final ReturnStatementContext ctx) { - return new JassReturnStatement(ctx.getStart().getLine(), - this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression())); + return wrap(ctx.getStart().getLine(), + new JassReturnStatement(this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression()))); } @Override public JassStatement visitReturnNothingStatement(final ReturnNothingStatementContext ctx) { - return new JassReturnNothingStatement(ctx.getStart().getLine()); + return wrap(ctx.getStart().getLine(), new JassReturnNothingStatement()); } @Override public JassStatement visitExitWhenStatement(final ExitWhenStatementContext ctx) { - return new JassExitWhenStatement(ctx.getStart().getLine(), - this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression())); + return wrap(ctx.getStart().getLine(), + new JassExitWhenStatement(this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression()))); } @Override @@ -82,8 +85,8 @@ public class JassStatementVisitor extends JassBaseVisitor { thenStatements.add(visit(statementCtx)); } final JassStatement elseIfTail = visit(ctx.ifStatementPartial()); - return new JassIfElseIfStatement(ctx.getStart().getLine(), - this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression()), thenStatements, elseIfTail); + return wrap(ctx.getStart().getLine(), new JassIfElseIfStatement( + this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression()), thenStatements, elseIfTail)); } @Override @@ -96,9 +99,9 @@ public class JassStatementVisitor extends JassBaseVisitor { for (final StatementContext statementCtx : ctx.statements(1).statement()) { elseStatements.add(visit(statementCtx)); } - return new JassIfElseStatement(ctx.getStart().getLine(), - this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression()), thenStatements, - elseStatements); + return wrap(ctx.getStart().getLine(), + new JassIfElseStatement(this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression()), + thenStatements, elseStatements)); } @Override @@ -107,7 +110,7 @@ public class JassStatementVisitor extends JassBaseVisitor { for (final StatementContext statementCtx : ctx.statements().statement()) { statements.add(visit(statementCtx)); } - return new JassLoopStatement(ctx.getStart().getLine(), statements); + return wrap(ctx.getStart().getLine(), new JassLoopStatement(statements)); } @Override @@ -116,27 +119,41 @@ public class JassStatementVisitor extends JassBaseVisitor { for (final StatementContext statementCtx : ctx.statements().statement()) { thenStatements.add(visit(statementCtx)); } - return new JassIfStatement(ctx.getStart().getLine(), - this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression()), thenStatements); + return wrap(ctx.getStart().getLine(), new JassIfStatement( + this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression()), thenStatements)); } @Override public JassStatement visitArrayedAssignmentStatement(final ArrayedAssignmentStatementContext ctx) { - return new JassArrayedAssignmentStatement(ctx.getStart().getLine(), ctx.ID().getText(), - this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression(0)), - this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression(1))); + return wrap(ctx.getStart().getLine(), + new JassArrayedAssignmentStatement(ctx.ID().getText(), + this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression(0)), + this.argumentExpressionHandler.expressionVisitor.visit(ctx.expression(1)))); } @Override public JassStatement visitBasicLocal(final BasicLocalContext ctx) { - return new JassLocalStatement(ctx.getStart().getLine(), ctx.ID().getText(), - this.jassTypeVisitor.visit(ctx.type())); + return wrap(ctx.getStart().getLine(), + new JassLocalStatement(ctx.ID().getText(), this.jassTypeVisitor.visit(ctx.type()))); } @Override public JassStatement visitDefinitionLocal(final DefinitionLocalContext ctx) { - return new JassLocalDefinitionStatement(ctx.getStart().getLine(), ctx.ID().getText(), - this.jassTypeVisitor.visit(ctx.type()), - this.argumentExpressionHandler.expressionVisitor.visit(ctx.assignTail().expression())); + return wrap(ctx.getStart().getLine(), + new JassLocalDefinitionStatement(ctx.ID().getText(), this.jassTypeVisitor.visit(ctx.type()), + this.argumentExpressionHandler.expressionVisitor.visit(ctx.assignTail().expression()))); + } + + public void setCurrentFileName(final String jassFile) { + this.jassFileName = jassFile; + } + + private static JassStatement wrap(final int lineNo, final JassStatement statement) { + if (JassSettings.DEBUG) { + return new DebuggingJassStatement(lineNo, statement); + } + else { + return statement; + } } }