0.33.1

Author: voidwyrm-2

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.33.1
+
+- (Fix) procedure execution from dot notation didn't enter the scope of the accessed dictionaries.
+
 ## 0.33.0
 
 - Added the 'alpha?', 'digit?', 'alphadigit?', 'sb-init', 'sb-addstr', 'sb-addbyte', and 'sb-build' operators to the 'strings' internal library

contrib.md

@@ -7,10 +7,9 @@ Basically, be polite to everyone and use common sense.
 ## Repository structure
 
 - `examples/` - the language examples; just various snippets I wrote to show off the language.
-- `out/`, `dist/` - the binary output folders, these contains the resulting executables and the zip files created from them, respectively; these should **always** be gitignored.
+- `bin/`, `dist/` - the binary output folders, these contains the resulting executables and the zip files created from them, respectively; these should **always** be gitignored.
 - `src/builtins.nim` - the builtin functions that are always available without importing.
 - `src/builtinlibs/` - the internal libraries that come built into Page, such as `strings` and `http`.
-- `src/valueimpls` - the implementations for the individual value objects, which get `include`'d into `src/values.nim`; this folder may get removed in the future, see item No. 1 of [todo.md](/todo.md)
 - `src/std/` - the parts of the standard library implementated in Page that are written to `~/.page/std/`.
 - `src/data/` - miscellaneous data that gets included into the binary at compile-time.
 
@@ -22,7 +21,7 @@ Differences and/or specifics are:
 
 - Imports, type definitions, and functions should be separated by two lines instead of one. See [parser.nim](/src/parser.nim) for an example.
 
-- If an import is from a different namespace, it should be prefixed with `pkg/` and `std/`, respectively. See [builtins.nim](/src/builtins.nim) for an example.
+- If an import is from a different namespace, it should be prefixed with `pkg/` or `std/`. See [builtins.nim](/src/builtins.nim) for an example.
 
 - Single item imports/exports should be on a single line. See [builtins.nim](/src/builtins.nim) for an example.
 

page.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.33.0"
+version       = "0.33.1"
 author        = "Nuclear Pasta"
 description   = "A PostScript-like language"
 license       = "Apache-2.0"

src/builtinlibs/common.nim

@@ -76,7 +76,7 @@ proc literalize*(s: State, nodes: seq[Node]): seq[Value] =
       result[i] = newProcedure(@[], proc(sptr: pointer, ps: ProcState) = 
         let
           s = cast[State](sptr)
-          (literal, v) = s.nestedGet(n)
+          (literal, _, v) = s.nestedGet(n)
 
         if v.typ == tProcedure and not literal:
           s.check(v.args)

src/interpreter.nim

@@ -103,7 +103,16 @@ proc exec(self: Interpreter, n: Node) =
       logger.logdv("Word is not a function")
       self.state.push(v)
   of nDot:
-    let (literal, v) = self.state.nestedGet(n)
+    let
+      origScopeCount = self.state.dicts.len
+      (literal, scopes, v) = self.state.nestedGet(n)
+
+    for d in scopes:
+      self.state.dbegin(d)
+
+    defer:
+      for _ in 0..<scopes.len - (self.state.dicts.len - origScopeCount):
+        discard self.state.dend(self.pstate)
 
     if v.typ == tProcedure and not literal:
       self.state.check(v.args)

src/state.nim

@@ -122,13 +122,15 @@ proc unset*(self: State, name: string): bool =
   result = d.hasKey(name)
   d.del(name)
 
-proc nestedGet*(self: State, node: Node): tuple[literal: bool, val: Value] =
+proc nestedGet*(self: State, node: Node): tuple[literal: bool, scopes: seq[Dict], val: Value] =
   if node.typ != nDot:
     panic("Node is not nDot")
 
   let d =
     if node.left.typ == nDot:
-      self.nestedGet(node.left).val
+      let (_, scopes, v) = self.nestedGet(node.left)
+      result.scopes.add(scopes)
+      v
     else:
       self.get(node.left.tok.lit)
 
@@ -143,12 +145,15 @@ proc nestedGet*(self: State, node: Node): tuple[literal: bool, val: Value] =
     t = d.dictv
     name = node.right.tok.lit
 
+  result.scopes.add(t)
+
   if not t.hasKey(name):
     let e = newPgError(fmt"Undefined symbol '{name}'")
     e.addTrace(node.right.trace())
     raise e
 
-  result = (node.right.typ == nSymbol, t[name])
+  result.literal = node.right.typ == nSymbol
+  result.val = t[name]
 
 proc push*(self: State, val: Value) =
   self.stack.add(val)