pre 1.24 support

Author: Frotty

wurst.build

@@ -1,4 +1,4 @@
 ---
 projectName: Wurst Standard Library 2
 dependencies: []
-wc3Patch: v1.28
+wc3Patch: v1.23a

wurst/_handles/GroupTests.wurst

@@ -23,9 +23,6 @@ function testGroupBasic()
 	g.add(u2)
 	g.size().assertEquals(12)
 
-	print("---")
-	print(u2.getHandleId())
-
 	g.clear()
 	assertTrue(g.isEmpty())
 
@@ -69,16 +66,6 @@ function testRandom()
 
 	assertTrue(g.isEmpty())
 
-@Test
-function testHandleId()
-	let g = CreateGroup()
-	assertTrue(g.getHandleId() != 0)
-
-	for i = 0 to 100
-		let g2 = CreateGroup()
-		assertTrue(g2.getHandleId() != 0)
-		assertTrue(g2.getHandleId() != g.getHandleId())
-
 @Test
 function testVararg()
 	let g = CreateGroup()

wurst/_handles/Hashtable.wurst

@@ -2,7 +2,7 @@ package HashtableTests
 
 @Test
 function testBasicDatatypes()
-	let ht = InitHashtable()
+	let ht = initHashtable()
 	ht.saveBoolean(0, 0, true)
 	ht.saveInt(0, 0, 1)
 	ht.saveReal(0, 0, 2.)
@@ -20,7 +20,7 @@ function testBasicDatatypes()
 
 @Test
 function testFlushing()
-	let ht = InitHashtable()
+	let ht = initHashtable()
 	ht.saveReal(0, 0, 2.)
 	ht.saveReal(1, 0, 4.)
 	ht.flushChild(0)
@@ -34,7 +34,7 @@ function testFlushing()
 
 @Test
 function testOverwrite()
-	let ht = InitHashtable()
+	let ht = initHashtable()
 	ht.saveReal(0, 0, 2.)
 	ht.saveReal(0, 0, 4.)
 
@@ -43,7 +43,7 @@ function testOverwrite()
 
 @Test
 function testRemove()
-	let ht = InitHashtable()
+	let ht = initHashtable()
 	ht.saveReal(0, 0, 2.)
 	assertTrue(ht.hasReal(0,0))
 

wurst/_handles/HashtableTests.wurst

@@ -7,9 +7,6 @@ public function timer.destr()
 public function timer.getElapsed() returns real
 	return TimerGetElapsed(this)
 
-public function timer.getHandleId() returns int
-	return GetHandleId(this)
-
 public function timer.pause()
 	PauseTimer(this)
 

wurst/_handles/Timer.wurst

@@ -213,9 +213,6 @@ public function unit.getHP() returns real
 public function unit.getHPRatio() returns real
 	return this.getHP() / this.getMaxHP()
 
-public function handle.getHandleId() returns int
-	return GetHandleId(this)
-
 public function unit.getMana() returns real
 	return this.getState(UNIT_STATE_MANA)
 

wurst/_handles/Unit.wurst

@@ -224,8 +224,29 @@ public function stringCompare(string s1, string s2) returns int
 		return 1
 	return 0
 
+/** Maps a single-character string to an integer code point.
+	Used by getHash() since the native StringHash does not exist pre-1.24. */
+function charCode(string c) returns int
+	// Build a stable code from the charset position, falling back to length
+	// and content so unknown chars still contribute deterministically.
+	let idx = c.toCharsetInt()
+	if idx >= 0
+		return idx + 1
+	// Non-charset char (punctuation/whitespace): derive a stable value from
+	// upper/lower casing so it still differs between distinct characters.
+	return c == c.toUpperCase() ? 0x5BD1 : 0x2F35
+
+/** Returns a deterministic hash of this string.
+
+	Pre-1.24 patches lack the native `StringHash`, so this is a pure-Wurst
+	polynomial rolling hash. Values differ from the WC3 native, but are stable
+	within a game and only used for internal keying. */
 public function string.getHash() returns int
-	return StringHash(this)
+	var hash = 0x811C9DC5
+	let len = this.length()
+	for i = 0 to len - 1
+		hash = (hash * 33) + charCode(this.substring(i, i + 1))
+	return hash
 
 /** Formats the given string replacing {x} delimiters with the passed replacements.
 	Example: "You got {0} gold".format(goldAmount) **/

wurst/_handles/primitives/String.wurst

@@ -110,7 +110,10 @@ package StringTests
 	"dfdf".replace("", "2").assertEquals("dfdf")
 
 @Test function testGetHash()
-	"test".getHash().assertEquals(StringHash("test"))
+	// Pre-1.24 has no native StringHash; getHash() is a pure-Wurst hash.
+	// Verify it is deterministic and distinguishes distinct strings.
+	"test".getHash().assertEquals("test".getHash())
+	assertTrue("test".getHash() != "tset".getHash())
 
 @Test function testFormat()
 	"te{0}".format("s", "t").assertEquals("tes")

wurst/_handles/primitives/StringTests.wurst

@@ -11,7 +11,7 @@ import Annotations
 
 constant MUTE_ERROR_DURATION = 60
 constant PRIMARY_ERROR_KEY = -1
-constant HT = InitHashtable()
+constant HT = initHashtable()
 
 /**
 	Stores the last error thrown by error().

wurst/_wurst/ErrorHandling.wurst

@@ -42,177 +42,13 @@ public function playerFromIndex(int index) returns player
 public function playerToIndex(player object) returns int
 	return object.getId()
 
-public function widgetFromIndex(int index) returns widget
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadWidget(0)
-
-public function widgetToIndex(widget object) returns int
-	return object.getHandleId()
-
-public function unitFromIndex(int index) returns unit
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadUnit(0)
-
-public function unitToIndex(unit object) returns int
-	return object.getHandleId()
-
-public function destructableFromIndex(int index) returns destructable
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadDestructable(0)
-
-public function destructableToIndex(destructable object) returns int
-	return object.getHandleId()
-
-public function itemFromIndex(int index) returns item
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadItem(0)
-
-public function itemToIndex(item object) returns int
-	return object.getHandleId()
-
-public function abilityFromIndex(int index) returns ability
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadAbility(0)
-
-public function abilityToIndex(ability object) returns int
-	return object.getHandleId()
-
-public function forceFromIndex(int index) returns force
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadForce(0)
-
-public function forceToIndex(force object) returns int
-	return object.getHandleId()
-
-public function groupFromIndex(int index) returns group
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadGroup(0)
-
-public function groupToIndex(group object) returns int
-	return object.getHandleId()
-
-public function triggerFromIndex(int index) returns trigger
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadTrigger(0)
-
-public function triggerToIndex(trigger object) returns int
-	return object.getHandleId()
-
-public function timerFromIndex(int index) returns timer
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadTimer(0)
-
-public function timerToIndex(timer object) returns int
-	return object.getHandleId()
-
-public function locationFromIndex(int index) returns location
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadLocation(0)
-
-public function locationToIndex(location object) returns int
-	return object.getHandleId()
-
-public function regionFromIndex(int index) returns region
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadRegion(0)
-
-public function regionToIndex(region object) returns int
-	return object.getHandleId()
-
-public function rectFromIndex(int index) returns rect
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadRect(0)
-
-public function rectToIndex(rect object) returns int
-	return object.getHandleId()
-
-public function soundFromIndex(int index) returns sound
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadSound(0)
-
-public function soundToIndex(sound object) returns int
-	return object.getHandleId()
-
-public function effectFromIndex(int index) returns effect
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadEffect(0)
-
-public function effectToIndex(effect object) returns int
-	return object.getHandleId()
-
-public function dialogFromIndex(int index) returns dialog
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadDialog(0)
-
-public function dialogToIndex(dialog object) returns int
-	return object.getHandleId()
-
-public function buttonFromIndex(int index) returns button
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadButton(0)
-
-public function buttonToIndex(button object) returns int
-	return object.getHandleId()
-
-public function questFromIndex(int index) returns quest
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadQuest(0)
-
-public function questToIndex(quest object) returns int
-	return object.getHandleId()
-
-public function questitemFromIndex(int index) returns questitem
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadQuestItem(0)
-
-public function questitemToIndex(questitem object) returns int
-	return object.getHandleId()
-
-public function leaderboardFromIndex(int index) returns leaderboard
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadLeaderboard(0)
-
-public function leaderboardToIndex(leaderboard object) returns int
-	return object.getHandleId()
-
-public function multiboardFromIndex(int index) returns multiboard
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadMultiboard(0)
-
-public function multiboardToIndex(multiboard object) returns int
-	return object.getHandleId()
-
-public function trackableFromIndex(int index) returns trackable
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadTrackable(0)
-
-public function trackableToIndex(trackable object) returns int
-	return object.getHandleId()
-
-public function lightningFromIndex(int index) returns lightning
-	return typecastdata.loadLightning(index)
-
-public function lightningToIndex(lightning object) returns int
-	typecastdata.saveLightning(-object.getHandleId(), object)
-	return -object.getHandleId()
-
-public function imageFromIndex(int index) returns image
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadImage(0)
-
-public function imageToIndex(image object) returns int
-	return object.getHandleId()
-
-public function ubersplatFromIndex(int index) returns ubersplat
-	typecastdata.saveFogState(0,ConvertFogState(index))
-	return typecastdata.loadUbersplat(0)
-
-public function ubersplatToIndex(ubersplat object) returns int
-	return object.getHandleId()
-	
 public function booleanToIndex(boolean u) returns int
 	return u ? 1 : 0
 
 public function booleanFromIndex(int index) returns boolean
 	return index == 1
 
+// NOTE: Pre-1.24 patches provide neither `GetHandleId` nor the `hashtable`
+// native, so there is no way to convert a handle (unit, trigger, effect, ...)
+// to an integer and back. All handle-based to/from-index conversions that the
+// later-patch stdlib offers are therefore unavailable on this branch.