minor improvements of runtime efficiency

pine-vm · Jan 2, 2025 · 6b938dc · 6b938dc
1 parent 05c00ec
commit 6b938dc
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 11 deletions.
diff --git a/implement/Pine.Core/PopularValues.cs b/implement/Pine.Core/PopularValues.cs
@@ -468,6 +468,37 @@ from c2 in Enumerable.Range(0, 128)
         "Leaf",
         "Branch2",
 
+        "module",
+        "exposing",
+        "import",
+        "as",
+        "if",
+        "then",
+        "else",
+        "let",
+        "in",
+        "case",
+        "of",
+        "type",
+        "alias",
+        "port",
+        "infix",
+        "infixl",
+        "infixr",
+        "where",
+
+        "Problem",
+        "ExpectingNumber",
+        "ExpectingSymbol",
+        "ExpectingAnyChar",
+        "ExpectingKeyword",
+        "ExpectingCharSatisfyingPredicate",
+        "ExpectingStringSatisfyingPredicate",
+        "ExpectingCustom",
+        "ExpectingOneOf",
+
+
+
         // module LanguageService
 
         "LanguageService",

diff --git a/implement/pine/Pine/PineVM/PineVM.cs b/implement/pine/Pine/PineVM/PineVM.cs
@@ -2403,21 +2403,22 @@ public static PineValue ValueFromPathInValueOrEmptyList(
         PineValue environment,
         ReadOnlySpan<int> path)
     {
-        if (path.Length is 0)
-            return environment;
+        var currentNode = environment;
 
-        if (environment is not PineValue.ListValue listValue)
-            return PineValue.EmptyList;
+        for (var i = 0; i < path.Length; i++)
+        {
+            if (currentNode is not PineValue.ListValue listValue)
+                return PineValue.EmptyList;
 
-        var skipCount = path[0];
+            var skipCount = path[i];
 
-        if (path[0] >= listValue.Elements.Count)
-            return PineValue.EmptyList;
+            if (skipCount >= listValue.Elements.Count)
+                return PineValue.EmptyList;
 
-        return
-            ValueFromPathInValueOrEmptyList(
-                listValue.Elements[skipCount < 0 ? 0 : skipCount],
-                path[1..]);
+            currentNode = listValue.Elements[skipCount < 0 ? 0 : skipCount];
+        }
+
+        return currentNode;
     }
 
     public PineValue EvaluateConditionalExpression(