0.37.0

Author: voidwyrm-2

changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.37.0
+
+- Page now has 'comma notation' for using dot notation on values on the stack, e.g. `,set`, `,names.add`
+- 'roll' now rolls in the reverse direction, e.g. `3 -1 roll` now rolls to the left
+- Added the 'nip' and 'over' builtin operators
+- Added the 'f-readline' operator to the 'io' internal library
+
 ## 0.36.1
 
 - 'slice' causes a fatal crash when slicing strings

examples/fib.pg

@@ -1,12 +1,3 @@
-% 'over', a common stack language operation,
-% isn't in Page because 'roll' implements part of its functionality
-/over {
-  % A B
-  exch dup % B A A
-  3 -1 roll % A A B
-  exch % A B A
-} def
-
 /fib {
 1 dict begin % Create a new dictionary with one initial slot
   /i exch def % Set 'i' to the amount of numbers given

examples/range.pg

@@ -1,13 +1,13 @@
-/2dup {dup dup} def
+/dup2 {dup dup} def
 
 % 4 9 range -> [4 5 6 7 8 9]
 /range {
-3 dict begin
+2 dict begin
   /rend exch def
   /rstart exch def
 
   [ rstart 1 sub
-    { 1 add 2dup
+    { 1 add dup2
 
       rend eq
       {pop exit}

page.nimble

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

src/builtinlibs/libio.nim

@@ -121,14 +121,36 @@ Reads a byte from a file and returns it as an integer.
 
   let f = cast[File](fobj.dat)
 
-  var b: byte
+  var b: char
   try:
-    b = f.readChar().byte
-  except IoError as e:
+    b = f.readChar()
+  except IOError as e:
     raise newPgError(e.msg)
 
   s.push(newInteger(b.int))
 
+addF("f-readline",
+"""
+'f-readline'
+FILE -> str
+Reads everything until a newline.
+LF and CRLF are both valid.
+The newline is not a part of the returned string.
+""", @[("FILE", tExtitem)]):
+  let fobj = s.pop()
+
+  let f = cast[File](fobj.dat)
+
+  fobj.checkPgFile()
+
+  var content: string
+  try:
+    content = f.readLine()
+  except IOError as e:
+    raise newPgError(e.msg)
+
+  s.push(newString(content))
+
 addF("f-readall",
 """
 'f-readall'
@@ -144,7 +166,7 @@ Reads everything from a file object and returns the contents as a string.
   var content: string
   try:
     content = f.readAll()
-  except IoError as e:
+  except IOError as e:
     raise newPgError(e.msg)
 
   s.push(newString(content))
@@ -166,5 +188,5 @@ Writes a string S to a file object and returns the amount written.
   try:
     let b = f.writeBuffer(str[0].addr, str.len)
     s.push(newInteger(b))
-  except IoError as e:
+  except IOError as e:
     raise newPgError(e.msg)

src/builtinlibs/libos.nim

@@ -70,7 +70,7 @@ Returns the path to the current file.
 addF("argv",
 """
 'argv'
--> list<str>
+-> list(str)
 Returns the program arguments.
 """, @[]):
   s.push(newList(s.g.args.map(newString)))

src/builtinlibs/libstrings.nim

@@ -23,7 +23,7 @@ template addS(name, doc: string, args: ProcArgs, body: string) =
 addF("chars",
 """
 'chars'
-S -> list<str>
+S -> list(str)
 Separates a string S into a list L of character strings.
 """, @[("S", tString)]):
   let str = s.pop().strv
@@ -38,7 +38,7 @@ Separates a string S into a list L of character strings.
 addF("split",
 """
 'split'
-S D -> list<str>
+S D -> list(str)
 Separates a string S into a list L of parts by a delimiter D.
 """, @[("S", tString), ("D", tString)]):
   let

src/builtins.nim

@@ -382,9 +382,9 @@ Returns true if the stack has at least two items on it, false otherwise.
 addF("pop",
 """
 'pop'
-V ->
-Discards a value V.
-""", @[("V", tAny)]):
+X ->
+Discards a value X.
+""", @[("X", tAny)]):
   discard s.pop()
 
 addF("dup",
@@ -414,15 +414,15 @@ Positive R rotates to the right, negative R rotates to the left.
   var expe = newProcArgs(count)
 
   for i in 0..<expe.len():
-    expe[i] = ("I" & $(i + 1), tAny)
+    expe[i] = ("V" & $(i + 1), tAny)
 
   s.check(expe)
 
   let st = s.stack()
 
   var sl = st[st.len() - count .. ^1]
 
-  sl.rotateLeft(-roll)
+  sl.rotateLeft(roll)
 
   var j = 0
 
@@ -441,19 +441,34 @@ Exchanges the positions of values X and Y.
 addS("rot",
 """
 'rot'
-X Y Z -> Y Z X
-Rotates the top three values on the stack to the left.
+X Y Z -> Z X Y
+Rotates the top three values on the stack to the right.
 """, @[("X", tAny), ("Y", tAny), ("Z", tAny)]):
   "3 1 roll"
 
 addS("-rot",
 """
 '-rot'
-X Y Z -> Z X Y
-Rotates the top three values on the stack to the right.
+X Y Z -> Y Z X
+Rotates the top three values on the stack to the left.
 """, @[("X", tAny), ("Y", tAny), ("Z", tAny)]):
   "3 -1 roll"
 
+addS("nip",
+"""
+'nip'
+X Y -> Y
+Discards the second-from-top value on the stack.
+""", @[("X", tAny), ("Y", tAny)]):
+  "exch pop"
+
+addS("over",
+"""
+'over'
+X Y -> X Y X
+Discards the second-from-top value to the top of the stack.
+""", @[("X", tAny), ("Y", tAny)]):
+  "exch dup rot"
 
 # Arithmetic operators
 
@@ -1243,7 +1258,7 @@ end"""
 addF("symbols",
 """
 'symbols'
--> list<symbol>
+-> list(symbol)
 Returns a list of the symbols inside the last opened dictionary.
 """, @[]):
   let symbols = s.symbols
@@ -1257,7 +1272,7 @@ Returns a list of the symbols inside the last opened dictionary.
 addF("rsymbols",
 """
 'rsymbols'
--> list<list<symbol>>
+-> list(list(symbol))
 Returns a list of lists of the symbols in each dictionary.
 """, @[]):
   let dicts = s.dicts

src/lexer.nim

@@ -24,7 +24,8 @@ type
     ttBracketClose,
     ttBraceOpen,
     ttBraceClose,
-    ttDot
+    ttDot,
+    ttComma
 
   Token* = object
     typ: TokenType
@@ -50,6 +51,8 @@ func toTokenType(ch: char, tt: var TokenType): bool =
     tt = ttBraceClose
   of '.':
     tt = ttDot
+  of ',':
+    tt = ttComma
   else:
     return false
 
@@ -80,6 +83,8 @@ func name*(typ: TokenType): string =
     "'}'"
   of ttDot:
     "'.'"
+  of ttComma:
+    "','"
 
 
 func initToken*(typ: TokenType, file, lit: string, col, ln: int): Token =

src/parser.nim

@@ -26,6 +26,7 @@ type
       anchor*: Token
       nodes*: seq[Node]
     of nDot:
+      dot*: Token
       left*, right*: Node
 
   Parser* = ref object
@@ -63,7 +64,10 @@ func trace*(self: Node): string =
   of nList, nProc:
     self.anchor.trace()
   of nDot:
-    self.left.trace()
+    if self.left == nil:
+      self.dot.trace()
+    else:
+      self.left.trace()
 
 func copy*(self: Node): Node =
   case self.typ
@@ -93,7 +97,9 @@ proc `$`*(self: Node): string =
   of nList, nProc:
     result &= $self.nodes
   of nDot:
-    result &= $self.left
+    if self.left != nil:
+      result &= $self.left
+
     result &= "."
     result &= $self.right
 
@@ -124,6 +130,13 @@ proc eat(self: Parser, tt: TokenType): Token =
 
   inc self.idx
 
+proc parseDot(self: Parser, start: Node): Node =
+  result = start
+
+  while self.isType(ttDot):
+    result = Node(typ: nDot, dot: self.eat(ttDot), left: result)
+    result.right = Node(typ: nWord, tok: self.eat(ttWord))
+
 proc parseInner(self: Parser, startTok: ptr Token, endType: TokenType): seq[Node] =
   while self.idx < self.toks.len:
     let tok = self.toks[self.idx]
@@ -134,16 +147,13 @@ proc parseInner(self: Parser, startTok: ptr Token, endType: TokenType): seq[Node
       inc self.idx
 
       if self.isType(ttDot):
-        var le = n
-
-        while self.isType(ttDot):
-          inc self.idx
-          le = Node(typ: nDot, left: le)
-          le.right = Node(typ: nWord, tok: self.eat(ttWord))
-
-        result.add(le)
+        result.add(self.parseDot(n))
       else:
         result.add(n)
+    of ttComma:
+      let n = Node(typ: nDot, dot: self.eat(ttComma), left: nil)
+      n.right = Node(typ: nWord, tok: self.eat(ttWord))
+      result.add(self.parseDot(n))
     of ttSymbol:
       result.add(Node(typ: nSymbol, tok: tok))
       inc self.idx