fixed some bugs

TheMaster1127 · Jun 26, 2024 · c7a4fc7 · c7a4fc7
1 parent 94516ce
commit c7a4fc7
Show file tree

Hide file tree

Showing 4 changed files with 190 additions and 54 deletions.
diff --git a/HTH-Playground.hth b/HTH-Playground.hth
@@ -472,13 +472,40 @@ outOftranspileVariables := StrReplace(outOftranspileVariables, "cyiasasasasstAYt
 
 ;OutputDebug, %outOftranspileVariables%
 
-outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.true", "true")
+
+; Check and replace "variables.false"
+if (SubStr(outOftranspileVariables, -14) = "variables.false")
+{
 outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.false", "false")
+}
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.false ", "false ")
+
+; Check and replace "variables.if"
+if (SubStr(outOftranspileVariables, -11) = "variables.if")
+{
 outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.if", "if")
+}
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.if ", "if ")
+
+; Check and replace "variables.else"
+if (SubStr(outOftranspileVariables, -13) = "variables.else")
+{
 outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.else", "else")
+}
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.else ", "else ")
+
+
+; Check and replace "variables.true"
+if (SubStr(outOftranspileVariables, -13) = "variables.true")
+{
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.true", "true")
+}
+
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.true ", "true ")
+
 
-outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.and", "&&")
-outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.or", "||")
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.and ", "&& ")
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.or ", "|| ")
 
 
 outOftranspileVariables := StrReplace(outOftranspileVariables, " = ", " == ")

diff --git a/HTH.htpy b/HTH.htpy
@@ -340,13 +340,40 @@ outOftranspileVariables := StrReplace(outOftranspileVariables, "cyiasasasasstAYt
 
 ;OutputDebug, %outOftranspileVariables%
 
-outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.true", "true")
+
+; Check and replace "variables.false"
+if (SubStr(outOftranspileVariables, -14) = "variables.false")
+{
 outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.false", "false")
+}
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.false ", "false ")
+
+; Check and replace "variables.if"
+if (SubStr(outOftranspileVariables, -11) = "variables.if")
+{
 outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.if", "if")
+}
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.if ", "if ")
+
+; Check and replace "variables.else"
+if (SubStr(outOftranspileVariables, -13) = "variables.else")
+{
 outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.else", "else")
+}
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.else ", "else ")
+
+
+; Check and replace "variables.true"
+if (SubStr(outOftranspileVariables, -13) = "variables.true")
+{
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.true", "true")
+}
+
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.true ", "true ")
+
 
-outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.and", "&&")
-outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.or", "||")
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.and ", "&& ")
+outOftranspileVariables := StrReplace(outOftranspileVariables, "variables.or ", "|| ")
 
 
 outOftranspileVariables := StrReplace(outOftranspileVariables, " = ", " == ")

diff --git a/HTH.py b/HTH.py
@@ -365,12 +365,24 @@ def transpileVariables(sstr123455, functionNames):
     variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , Chr(92) +  Chr(92), Chr(96))
     variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "cyiasasasasstAYtheummonlyemlpystringya-a-"  +  Chr(100), Chr(34) +  Chr(34))
     #OutputDebug, %outOftranspileVariables%
-    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.true" , "true")
-    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.false" , "false")
-    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.if" , "if")
-    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.else" , "else")
-    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.and" , "&&")
-    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.or" , "||")
+    # Check and replace "variables.false"
+    if (SubStr(variables['outOftranspileVariables'] , -14)== "variables.false"):
+        variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.false" , "false")
+    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.false " , "false ")
+    # Check and replace "variables.if"
+    if (SubStr(variables['outOftranspileVariables'] , -11)== "variables.if"):
+        variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.if" , "if")
+    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.if " , "if ")
+    # Check and replace "variables.else"
+    if (SubStr(variables['outOftranspileVariables'] , -13)== "variables.else"):
+        variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.else" , "else")
+    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.else " , "else ")
+    # Check and replace "variables.true"
+    if (SubStr(variables['outOftranspileVariables'] , -13)== "variables.true"):
+        variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.true" , "true")
+    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.true " , "true ")
+    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.and " , "&& ")
+    variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , "variables.or " , "|| ")
     variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , " = " , " == ")
     variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , " = " , " == ")
     variables['outOftranspileVariables'] = StrReplace(variables['outOftranspileVariables'] , " ( " , " (")
@@ -3516,4 +3528,3 @@ def compiler():
 FileDelete("" + variables['filePathOfCode'] + "")
 FileAppend("" + variables['jsCodeOut'] + "", "" + variables['filePathOfCode'] + "")
 print("Transpiled!")
-