split revStringRange as its own helper

DanielXMoore · Dec 29, 2024 · 95683a6 · 95683a6
1 parent 66daea1
commit 95683a6
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 63 deletions.
diff --git a/source/parser/for.civet b/source/parser/for.civet
@@ -72,13 +72,11 @@ function processRangeExpression(start: ASTNode, ws1: ASTNode, range: RangeDots,
           . "]"
       else
         children =
-          . getHelperRef "stringRange"
+          . getHelperRef startCode <= endCode ? "stringRange" : "revStringRange"
           . "("
           . startCode.toString()
           . ", "
           . length.toString()
-          . ", "
-          . (startCode <= endCode).toString()
           . ")"
       children.unshift range.error if range.error?
     else if startValue <? "number" and endValue <? "number"

diff --git a/source/parser/helper.civet b/source/parser/helper.civet
@@ -128,20 +128,31 @@ declareHelper := {
     state.prelude.push ["", [
       preludeVar
       stringRangeRef
-      ts [ ": (start: number, length: number, ascending: boolean) => string[]" ]
+      ts [ ": (start: number, length: number) => string[]" ]
       " "
       """
-      = (start, length, ascending) => {
+      = (start, length) => {
         if (length <= 0) return [];
         const arr = Array(length);
-        if (ascending) {
-          for (let i = 0; i < length; ++i) {
-            arr[i] = String.fromCharCode(start + i);
-          }
-        } else {
-          for (let i = 0; i < length; ++i) {
-            arr[i] = String.fromCharCode(start - i);
-          }
+        for (let i = 0; i < length; ++i) {
+          arr[i] = String.fromCharCode(start + i);
+        }
+        return arr;
+      }
+      """
+    ], ";\n"]
+  revStringRange(revStringRangeRef): void
+    state.prelude.push ["", [
+      preludeVar
+      revStringRangeRef
+      ts [ ": (start: number, length: number) => string[]" ]
+      " "
+      """
+      = (start, length) => {
+        if (length <= 0) return [];
+        const arr = Array(length);
+        for (let i = 0; i < length; ++i) {
+          arr[i] = String.fromCharCode(start - i);
         }
         return arr;
       }

diff --git a/test/range.civet b/test/range.civet
@@ -213,21 +213,15 @@ describe "range", ->
     ---
     [' '..'~']
     ---
-    var stringRange: (start: number, length: number, ascending: boolean) => string[] = (start, length, ascending) => {
+    var stringRange: (start: number, length: number) => string[] = (start, length) => {
       if (length <= 0) return [];
       const arr = Array(length);
-      if (ascending) {
-        for (let i = 0; i < length; ++i) {
-          arr[i] = String.fromCharCode(start + i);
-        }
-      } else {
-        for (let i = 0; i < length; ++i) {
-          arr[i] = String.fromCharCode(start - i);
-        }
+      for (let i = 0; i < length; ++i) {
+        arr[i] = String.fromCharCode(start + i);
       }
       return arr;
     };
-    stringRange(32, 95, true)
+    stringRange(32, 95)
   """
 
   testCase """
@@ -409,87 +403,63 @@ describe "range", ->
       ---
       [' '..<'~']
       ---
-      var stringRange: (start: number, length: number, ascending: boolean) => string[] = (start, length, ascending) => {
+      var stringRange: (start: number, length: number) => string[] = (start, length) => {
         if (length <= 0) return [];
         const arr = Array(length);
-        if (ascending) {
-          for (let i = 0; i < length; ++i) {
-            arr[i] = String.fromCharCode(start + i);
-          }
-        } else {
-          for (let i = 0; i < length; ++i) {
-            arr[i] = String.fromCharCode(start - i);
-          }
+        for (let i = 0; i < length; ++i) {
+          arr[i] = String.fromCharCode(start + i);
         }
         return arr;
       };
-      stringRange(32, 94, true)
+      stringRange(32, 94)
     """
 
     testCase """
       ..> long with strings
       ---
       ['~'..>' ']
       ---
-      var stringRange: (start: number, length: number, ascending: boolean) => string[] = (start, length, ascending) => {
+      var revStringRange: (start: number, length: number) => string[] = (start, length) => {
         if (length <= 0) return [];
         const arr = Array(length);
-        if (ascending) {
-          for (let i = 0; i < length; ++i) {
-            arr[i] = String.fromCharCode(start + i);
-          }
-        } else {
-          for (let i = 0; i < length; ++i) {
-            arr[i] = String.fromCharCode(start - i);
-          }
+        for (let i = 0; i < length; ++i) {
+          arr[i] = String.fromCharCode(start - i);
         }
         return arr;
       };
-      stringRange(126, 94, false)
+      revStringRange(126, 94)
     """
 
     testCase """
       <.. long with strings
       ---
       [' '<..'~']
       ---
-      var stringRange: (start: number, length: number, ascending: boolean) => string[] = (start, length, ascending) => {
+      var stringRange: (start: number, length: number) => string[] = (start, length) => {
         if (length <= 0) return [];
         const arr = Array(length);
-        if (ascending) {
-          for (let i = 0; i < length; ++i) {
-            arr[i] = String.fromCharCode(start + i);
-          }
-        } else {
-          for (let i = 0; i < length; ++i) {
-            arr[i] = String.fromCharCode(start - i);
-          }
+        for (let i = 0; i < length; ++i) {
+          arr[i] = String.fromCharCode(start + i);
         }
         return arr;
       };
-      stringRange(33, 94, true)
+      stringRange(33, 94)
     """
 
     testCase """
       <..< long with strings
       ---
       [' '<..<'~']
       ---
-      var stringRange: (start: number, length: number, ascending: boolean) => string[] = (start, length, ascending) => {
+      var stringRange: (start: number, length: number) => string[] = (start, length) => {
         if (length <= 0) return [];
         const arr = Array(length);
-        if (ascending) {
-          for (let i = 0; i < length; ++i) {
-            arr[i] = String.fromCharCode(start + i);
-          }
-        } else {
-          for (let i = 0; i < length; ++i) {
-            arr[i] = String.fromCharCode(start - i);
-          }
+        for (let i = 0; i < length; ++i) {
+          arr[i] = String.fromCharCode(start + i);
         }
         return arr;
       };
-      stringRange(33, 93, true)
+      stringRange(33, 93)
     """
 
     throws """