simply override objmods if redefined in code

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/intermediateLang/interpreter/CompiletimeNatives.java

@@ -41,8 +41,8 @@ public ILconstTuple createObjectDefinition(ILconstString fileType, ILconstInt ne
         String objIdString = ObjectHelper.objectIdIntToString(newUnitId.getVal());
         boolean isMeleeOverride = newUnitId.getVal() == deriveFrom.getVal();
 
-        if (!isMeleeOverride && dataStore.getObjs().containsKey(ObjId.valueOf(objIdString))) {
-            globalState.compilationError("Object definition with id " + objIdString + " already exists.");
+        if (!globalState.registerCreatedObjectDefinition(fileType.getVal(), objIdString)) {
+            globalState.compilationError("Object definition with id " + objIdString + " is defined more than once.");
         }
         ObjMod.Obj objDef = newDefFromFiletype(dataStore, deriveFrom.getVal(), newUnitId.getVal(), isMeleeOverride);
         if (!isMeleeOverride) {
@@ -59,10 +59,12 @@ private ObjMod.Obj newDefFromFiletype(ObjMod<? extends ObjMod.Obj> dataStore, in
         if (isMeleeOverride) {
             ObjId id = ObjId.valueOf(ObjectHelper.objectIdIntToString(newId));
             // same id => modify melee/original definition table
+            dataStore.removeObj(id);
             return dataStore.addObj(id, null);
         }
         ObjId baseIdS = ObjId.valueOf(ObjectHelper.objectIdIntToString(base));
         ObjId newIdS = ObjId.valueOf(ObjectHelper.objectIdIntToString(newId));
+        dataStore.removeObj(newIdS);
         return dataStore.addObj(newIdS, baseIdS);
     }
 

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/intermediateLang/interpreter/ProgramStateIO.java

@@ -36,6 +36,7 @@ public class ProgramStateIO extends ProgramState {
     private @Nullable final MpqEditor mpqEditor;
     private final Map<ObjectFileType, ObjMod<? extends ObjMod.Obj>> dataStoreMap = Maps.newLinkedHashMap();
     private final Map<ObjectFileType, String> dataStoreHashes = Maps.newLinkedHashMap();
+    private final Map<String, Set<String>> createdObjectDefinitionIds = Maps.newLinkedHashMap();
     private int id = 0;
     private final Map<String, ObjMod.Obj> objDefinitions = Maps.newLinkedHashMap();
     private PrintStream outStream = System.err;
@@ -368,6 +369,11 @@ ObjMod.Obj getObjectDefinition(String key) {
         return objDefinitions.get(key);
     }
 
+    boolean registerCreatedObjectDefinition(String fileExtension, String objId) {
+        Set<String> ids = createdObjectDefinitionIds.computeIfAbsent(fileExtension, k -> new LinkedHashSet<>());
+        return ids.add(objId);
+    }
+
     /**
      * Calculate hash of an object file's contents
      */

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/CompiletimeNativesTest.java

@@ -1,23 +1,34 @@
 package tests.wurstscript.tests;
 
 import de.peeeq.wurstio.intermediateLang.interpreter.CompiletimeNatives;
+import de.peeeq.wurstio.intermediateLang.interpreter.ProgramStateIO;
 import de.peeeq.wurstio.objectreader.ObjectHelper;
+import de.peeeq.wurstscript.ast.Ast;
+import de.peeeq.wurstscript.ast.Element;
+import de.peeeq.wurstscript.gui.WurstGuiLogger;
+import de.peeeq.wurstscript.intermediatelang.ILconstInt;
 import de.peeeq.wurstscript.intermediatelang.ILconstString;
+import de.peeeq.wurstscript.jassIm.ImProg;
+import de.peeeq.wurstscript.jassIm.JassIm;
 import net.moonlightflower.wc3libs.bin.ObjMod;
 import net.moonlightflower.wc3libs.bin.app.objMod.W3A;
 import net.moonlightflower.wc3libs.bin.app.objMod.W3U;
 import net.moonlightflower.wc3libs.dataTypes.DataType;
+import net.moonlightflower.wc3libs.dataTypes.app.War3String;
 import net.moonlightflower.wc3libs.dataTypes.app.War3Real;
 import net.moonlightflower.wc3libs.misc.MetaFieldId;
 import net.moonlightflower.wc3libs.misc.ObjId;
 import org.testng.annotations.Test;
 
 import java.lang.reflect.Method;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 public class CompiletimeNativesTest {
@@ -104,4 +115,74 @@ public void differentIdsObjectDefinitionUsesCustomTable() throws Exception {
         assertEquals(w3u.getOrigObjs().size(), 0);
         assertEquals(w3u.getCustomObjs().size(), 1);
     }
+
+    @Test
+    public void differentIdsObjectDefinitionOverwritesExistingMapObject() throws Exception {
+        CompiletimeNatives natives = new CompiletimeNatives(null, null, false);
+        W3U w3u = new W3U();
+        int hfoo = ObjectHelper.objectIdStringToInt("hfoo");
+        int hf01 = ObjectHelper.objectIdStringToInt("hf01");
+        W3U.Obj existing = w3u.addObj(ObjId.valueOf("hf01"), ObjId.valueOf("hpea"));
+        existing.addMod(new ObjMod.Obj.Mod(MetaFieldId.valueOf("unam"), ObjMod.ValType.STRING, War3String.valueOf("old map object")));
+
+        Method newDefFromFiletype = CompiletimeNatives.class.getDeclaredMethod(
+            "newDefFromFiletype",
+            ObjMod.class,
+            int.class,
+            int.class,
+            boolean.class
+        );
+        newDefFromFiletype.setAccessible(true);
+
+        ObjMod.Obj obj = (ObjMod.Obj) newDefFromFiletype.invoke(natives, w3u, hfoo, hf01, false);
+
+        assertEquals(w3u.getCustomObjs().size(), 1, "Existing map object should be replaced instead of duplicated");
+        assertEquals(obj.getId().getVal(), "hf01");
+        assertEquals(obj.getBaseId().getVal(), "hfoo");
+        assertEquals(obj.getMods().size(), 0, "Overwritten map object mods should not leak into the Wurst-created object");
+    }
+
+    @Test
+    public void duplicateCodeObjectDefinitionsReportError() {
+        WurstGuiLogger gui = new WurstGuiLogger();
+        ProgramStateIO state = new ProgramStateIO(Optional.empty(), null, gui, emptyProg(), true);
+        CompiletimeNatives natives = new CompiletimeNatives(state, null, false);
+        int hfoo = ObjectHelper.objectIdStringToInt("hfoo");
+        int hf01 = ObjectHelper.objectIdStringToInt("hf01");
+
+        natives.createObjectDefinition(new ILconstString("w3u"), new ILconstInt(hf01), new ILconstInt(hfoo));
+        natives.createObjectDefinition(new ILconstString("w3u"), new ILconstInt(hf01), new ILconstInt(hfoo));
+
+        assertEquals(gui.getErrorCount(), 1);
+        assertTrue(gui.getErrors().contains("Object definition with id hf01 is defined more than once."));
+    }
+
+    @Test
+    public void createObjectDefinitionDoesNotReportExistingMapObjectAsError() throws Exception {
+        WurstGuiLogger gui = new WurstGuiLogger();
+        ProgramStateIO state = new ProgramStateIO(Optional.empty(), null, gui, emptyProg(), true);
+        CompiletimeNatives natives = new CompiletimeNatives(state, null, false);
+        int hfoo = ObjectHelper.objectIdStringToInt("hfoo");
+        int hf01 = ObjectHelper.objectIdStringToInt("hf01");
+
+        Method getDataStore = ProgramStateIO.class.getDeclaredMethod("getDataStore", String.class);
+        getDataStore.setAccessible(true);
+        W3U w3u = (W3U) getDataStore.invoke(state, "w3u");
+        W3U.Obj existing = w3u.addObj(ObjId.valueOf("hf01"), ObjId.valueOf("hpea"));
+        existing.addMod(new ObjMod.Obj.Mod(MetaFieldId.valueOf("unam"), ObjMod.ValType.STRING, War3String.valueOf("old map object")));
+
+        natives.createObjectDefinition(new ILconstString("w3u"), new ILconstInt(hf01), new ILconstInt(hfoo));
+
+        assertEquals(gui.getErrorCount(), 0);
+        assertEquals(w3u.getCustomObjs().size(), 1);
+        ObjMod.Obj obj = w3u.getCustomObjs().get(0);
+        assertEquals(obj.getId().getVal(), "hf01");
+        assertEquals(obj.getBaseId().getVal(), "hfoo");
+        assertFalse(obj.getMods().stream().anyMatch(m -> m.getId().getVal().equals("unam")));
+    }
+
+    private ImProg emptyProg() {
+        Element trace = Ast.NoExpr();
+        return JassIm.ImProg(trace, JassIm.ImVars(), JassIm.ImFunctions(), JassIm.ImMethods(), JassIm.ImClasses(), JassIm.ImTypeClassFuncs(), new HashMap<>());
+    }
 }