Replacing (size of $) with (#$) as should have been done before.

lib/base64/init.nom

@@ -4,7 +4,7 @@
     https://tools.ietf.org/html/rfc4648
     
 $b64_str = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-$b64_chars = [: for $ in 1 to (size of $b64_str): add ($b64_str, character $)]
+$b64_chars = [: for $ in 1 to (#$b64_str): add ($b64_str, character $)]
 $reverse_b64 = {: for $c in $b64_chars at $i: add $c = ($i - 1)}
 $reverse_b64."=" = 64
 set $reverse_b64's metatable to {.__index = (-> 0)}
@@ -18,10 +18,10 @@ test:
 external:
     [base64 $str, base64 encode $str, $str base64] all mean:
         $chars = []
-        for $i in 1 to (size of $str) via 3:
+        for $i in 1 to (#$str) via 3:
             $bytes = [=lua "\$str:byte(\$i, \($i + 2))"]
             $chars, add $b64_chars.((($bytes.1 & 252) >> 2) + 1)
-            if (size of $bytes) is:
+            if (#$bytes) is:
                 3:
                     $chars, add $b64_chars.((($bytes.1 & 3) << 4) + (($bytes.2 & 240) >> 4) + 1)
                     $chars, add $b64_chars.((($bytes.2 & 15) << 2) + (($bytes.3 & 192) >> 6) + 1)
@@ -40,7 +40,7 @@ external:
     (chr $) means (=lua "string.char(\$)")
     [decode base64 $str, $str base64 decoded, base64 decode $str] all mean:
         $chars = []
-        for $i in 1 to (size of $str) via 4:
+        for $i in 1 to (#$str) via 4:
             $indices = [: for $j in $i to ($i + 3): add $reverse_b64.($str, character $j)]
             $chars, add (chr (($indices.1 << 2) + (($indices.2 & 48) >> 4)))
             if (($str, character ($i + 2)) == "="): stop

lib/compatibility/2.4.nom

@@ -10,7 +10,8 @@ upgrade $tree to "2.4" as:
     unless ($tree is "Action" syntax tree): return
     if $tree.stub is:
         "when" "if":
-            if ((size of $tree) == 3): return $tree
+            if ((#$tree) == 3):
+                return $tree
             $conditions = []
             $new_lines = []
             $body =
@@ -22,7 +23,7 @@ upgrade $tree to "2.4" as:
                         $new_lines, add $line
                     
                     ($line.stub == "*"):
-                        if ((size of $line) == 2):
+                        if ((#$line) == 2):
                             $conditions, add $line.2
                         ..else:
                             $new_lines, add $line
@@ -60,7 +61,7 @@ upgrade $tree to "2.4" as:
                         $new_lines, add $line
                     
                     ($line.stub == "*"):
-                        if ((size of $line) == 2):
+                        if ((#$line) == 2):
                             $values, add $line.2
                         ..else:
                             $new_lines, add $line

lib/compatibility/2.nom

@@ -33,6 +33,5 @@ upgrade $tree to "2" as:
             $bits = [: for $ in $tree: add (($ upgraded) if ($ is syntax tree) else $)]
             unless (($bits, last) is "Block" syntax tree):
                 $body = ($bits, last)
-                $bits.(size of $bits) =
+                $bits.(#$bits) = (=lua "SyntaxTree{type='Block', source=\$body.source, \$body}")
-                    =lua "SyntaxTree{type='Block', source=\$body.source, \$body}"
             return (=lua "SyntaxTree{type='Action', source=\$tree.source, unpack(\$bits)}")

lib/compatibility/4.10.12.7.nom

@@ -40,7 +40,7 @@ upgrade action ($k = $v for $i in $start to $stop via $step) to "4.10.12.7" as
     {: for $i in $start to $stop by $step: add $k = $v}
 
 upgrade action (parse $text from $filename) to "4.10.12.7" as
-    (NomsuCode from (Source $filename 1 (size of $text)) $text) parsed
+    (NomsuCode from (Source $filename 1 (#$text)) $text) parsed
 
 upgrade action ($ as lua statements) to "4.10.12.7" as ($ as lua)
 upgrade action (compile error at $pos $err hint $hint) to "4.10.12.7" as
@@ -54,7 +54,7 @@ upgrade $tree to "4.10.12.7" as:
         $first_chunk = $tree.1
         $i = 1
         $has_use = (no)
-        repeat while ($i <= (size of $first_chunk)):
+        repeat while ($i <= (#$first_chunk)):
             if (($first_chunk.$i.type == "Action") and ($first_chunk.$i.stub == "use")):
                 $has_use = (yes)
             ..else:
@@ -69,12 +69,10 @@ upgrade $tree to "4.10.12.7" as:
         for $j in 1 to ($i - 1):
             $chunk1.$j = $first_chunk.$j
         
-        for $j in $i to (size of $first_chunk):
+        for $j in $i to (#$first_chunk):
             $chunk2.($j - $i + 1) = $first_chunk.$j
         
         $new_tree = ("FileChunks" tree from $tree.source with $chunk1 $chunk2)
-        
+        for $i in 2 to (#$tree):
-        for $i in 2 to (size of $tree):
             $new_tree.($i + 1) = $tree.$i
-        
         return $new_tree

lib/compatibility/4.8.10.nom

@@ -11,7 +11,7 @@ upgrade action "local action" to "4.8.10" via
         $body = $tree.4
         if $spec.type is:
             "List":
-                if ((size of $spec) == 1):
+                if ((#$spec) == 1):
                     return \($spec.1 means $body)
                 ..else:
                     return \($spec all mean $body)
@@ -26,7 +26,7 @@ upgrade action "action" to "4.8.10" via
         if $body:
             if $spec.type is:
                 "List":
-                    if ((size of $spec) == 1):
+                    if ((#$spec) == 1):
                         return \(externally $spec.1 means $body)
                     ..else:
                         return \(externally $spec all mean $body)
@@ -42,7 +42,7 @@ upgrade action "compile 1 to" to "4.8.10" via
         $body = $tree.4
         if $spec.type is:
             "List":
-                if ((size of $spec) == 1):
+                if ((#$spec) == 1):
                     return \($spec.1 compiles to $body)
                 ..else:
                     return \($spec all compile to $body)
@@ -56,7 +56,7 @@ upgrade action "parse 1 as" to "4.8.10" via
         $body = $tree.4
         if $spec.type is:
             "List":
-                if ((size of $spec) == 1):
+                if ((#$spec) == 1):
                     return \($spec.1 parses as $body)
                 ..else:
                     return \($spec all parse as $body)

lib/compatibility/4.9.nom

@@ -7,5 +7,6 @@ use "compatibility/compatibility"
 
 upgrade action "if" to "4.9" via
     for ($tree $end_version):
-        if ((size of $tree) > 2): return $tree
+        if ((#$tree) > 2):
+            return $tree
         return \(when $tree.2)

lib/compatibility/compatibility.nom

@@ -25,7 +25,7 @@ external:
         $lua = (Lua "")
         for $action in $actions:
             $replacements = {}
-            for $i in 1 to (size of $action):
+            for $i in 1 to (#$action):
                 if ($action.$i is "Var" syntax tree):
                     $replacements.($action.$i.1) = "\(\$tree as lua id)[\$i]"
             define mangler
@@ -74,6 +74,7 @@ external:
             if ($ver is "Text"):
                 return (($ as number) for $ in $ver matching "[0-9]+")
             return $ver
+        
         (Ver $) means:
             if ($ is "a List"):
                 if ($.1 is "Text"):
@@ -83,6 +84,7 @@ external:
             if $lib:
                 return {.lib = $lib, .version = ($ver as version list)}
             return {.version = ($ as version list)}
+        
         $start = (Ver $start_version)
         $end = (Ver $end_version)
         $end.lib or= $start.lib

lib/core/collections.nom

@@ -24,7 +24,7 @@ test:
     assume (($list, first) == 1)
     assume ($list, has 3)
     assume (($list, index of 3) == 3)
-    assume ((size of $list) == 5)
+    assume ((#$list) == 5)
     $list, add 6
     assume (($list, last) == 6)
     $list, pop
@@ -36,7 +36,7 @@ test:
 # Dict functionality
 test:
     $dict = {.x = 1, .y = 2, .z = 3}
-    assume (size of $dict) == 3
+    assume (#$dict) == 3
     assume [: for $k = $v in {.x = 1}: add {.key = $k, .value = $v}] ==
         [{.key = "x", .value = 1}]
     assume ({.x = 1, .y = 1} + {.y = 10, .z = 10}) == {.x = 1, .y = 11, .z = 10}
@@ -180,6 +180,7 @@ test:
     for $ in $r:
         $visited, add $
     assume ($visited == [1, 3, 5, 7, 9])
+
 $range_mt = {
     .__type = "a Range"
     .__index =
@@ -211,8 +212,7 @@ $range_mt = {
                     ($self.last == $other.last) and ($self.step == $other.step)
     
     .backwards = (for $self ($self.last to $self.first by (- $self.step)))
-    .__inext = $(inext)
+    .__inext = $(inext), .__next = $(inext)
-    .__next = $(inext)
     .as_text =
         for $self:
             if ($self.step == 1):
@@ -220,6 +220,7 @@ $range_mt = {
             ..else:
                 return "(\($self.first) to \($self.last) by \($self.step))"
 }
+
 $range_mt.reversed = $range_mt.backwards
 $range_mt.__unm = $range_mt.backwards
 $range_mt.__tostring = $range_mt.as_text

lib/core/control_flow.nom

@@ -42,8 +42,8 @@ test:
 (else $) compiles to:
     at (this tree) fail ("
         Compile error: This 'else' is not connected to any 'if' or 'unless' condition.
-        Hint: You should probably have a ".." in front of the "else", to indicate \
+        Hint: You should probably have a ".." in front of the "else", to indicate that it's attached \
-        ..that it's attached to the previous condition.
+        ..to the previous condition.
     ")
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -164,6 +164,7 @@ test:
 (for $var in $iterable $body) compiles to:
     unless $var:
         at (this tree) fail "No var here"
+    
     # This uses Lua's approach of only allowing loop-scoped variables in a loop
     if (($var.type == "Action") and ($var.stub == "1 =")):
         [$key, $value] = [$var.1, $var.3]
@@ -181,11 +182,13 @@ test:
                 local _start = \($start as lua expr)
                 for \($value as lua identifier)=_start,\($stop as lua expr) do
             ")
+        
         if $key:
             $loop, add ("
                 
                     local \($key as lua identifier) = \($value as lua identifier) - _start + 1;
             ")
+        
         go to (loop set)
     
     # Numeric loop with step:
@@ -196,11 +199,13 @@ test:
                 local _start, _step = \($start as lua expr), \($step as lua expr);
                 for \($value as lua identifier)=_start,\($stop as lua expr),_step do
             ")
+        
         if $key:
             $loop, add ("
                 
                     local \($key as lua identifier) = (\($value as lua identifier) - _start)/_step + 1
             ")
+        
         go to (loop set)
     
     # for $ in (...):
@@ -216,6 +221,7 @@ test:
             ")
 
     --- (loop set) ---
+    
     # TODO: don't always wrap in block
     $lua =
         Lua ("
@@ -236,8 +242,10 @@ test:
     $lua, add "\n    end"
     if ($key and ($body has subtree \(stop $key))):
         $lua, add "\n    " (\(---stop $key ---) as lua)
+    
     if ($body has subtree \(stop $value)):
         $lua, add "\n    " (\(---stop $value ---) as lua)
+    
     $lua, add "\nend -- for-loop"
     $lua, remove free vars [($value as lua identifier, text), $key and ($key as lua identifier, text)]
     return $lua
@@ -293,7 +301,6 @@ test:
     repeat 5 times:
         $x += 1
     assume $x == 5
-
 (repeat $n times $body) parses as (for (=lua "_i") in (1 to $n by 1) $body)
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -325,41 +332,41 @@ test:
     
     for $line in $body:
         unless
-            (($line.type == "Action") and ((size of $line) >= 2)) and
+            (($line.type == "Action") and ((#$line) >= 2)) and
-                $line.(size of $line) is "Block" syntax tree
+                $line.(#$line) is "Block" syntax tree
         ..:
             at $line fail ("
                 Compile error: Invalid line for the body of an 'if' block.
-                Hint: Each line should contain one or more conditional expressions followed \
+                Hint: Each line should contain one or more conditional expressions followed by a block, \
-                ..by a block, or "else" followed by a block.
+                ..or "else" followed by a block.
             ")
-        $action = $line.(size of $line)
+        $action = $line.(#$line)
-        if (($line.1 == "else") and ((size of $line) == 2)):
+        if (($line.1 == "else") and ((#$line) == 2)):
             unless $else_allowed:
                 at $line fail ("
                     Compile error: You can't have two 'else' blocks.
                     Hint: Merge all of the 'else' blocks together.
                 ")
             
-            unless ((size of "\$code") > 0):
+            unless ((#"\$code") > 0):
                 at $line fail ("
                     Compile error: You can't have an 'else' block without a preceding condition.
-                    Hint: If you want the code in this block to always execute, you don't need a \
+                    Hint: If you want the code in this block to always execute, you don't need a conditional \
-                    ..conditional block around it. Otherwise, make sure the 'else' block comes last.
+                    ..block around it. Otherwise, make sure the 'else' block comes last.
                 ")
             
             $code, add "\nelse\n    " ($action as lua)
             $else_allowed = (no)
         ..else:
             $code, add $clause " "
-            for $i in 1 to ((size of $line) - 1):
+            for $i in 1 to ((#$line) - 1):
                 if ($i > 1):
                     $code, add " or "
                 $code, add ($line.$i as lua expr)
             $code, add " then\n    " ($action as lua)
             $clause = "\nelseif"
     
-    if ((size of "\$code") == 0):
+    if ((#"\$code") == 0):
         at $body fail ("
             Compile error: 'if' block has an empty body.
             Hint: This means nothing would happen, so the 'if' block should be deleted.
@@ -396,40 +403,40 @@ test:
     
     for $line in $body:
         unless
-            (($line.type == "Action") and ((size of $line) >= 2)) and
+            (($line.type == "Action") and ((#$line) >= 2)) and
-                $line.(size of $line) is "Block" syntax tree
+                $line.(#$line) is "Block" syntax tree
         ..:
             at $line fail ("
                 Compile error: Invalid line for 'if' block.
                 Hint: Each line should contain expressions followed by a block, or "else" followed by a block.
             ")
-        $action = $line.(size of $line)
+        $action = $line.(#$line)
-        if (($line.1 == "else") and ((size of $line) == 2)):
+        if (($line.1 == "else") and ((#$line) == 2)):
             unless $else_allowed:
                 at $line fail ("
                     Compile error: You can't have two 'else' blocks.
                     Hint: Merge all of the 'else' blocks together.
                 ")
             
-            unless ((size of "\$code") > 0):
+            unless ((#"\$code") > 0):
                 at $line fail ("
                     Compile error: You can't have an 'else' block without a preceding condition.
-                    Hint: If you want the code in this block to always execute, you don't need \
+                    Hint: If you want the code in this block to always execute, you don't need a conditional \
-                    ..a conditional block around it. Otherwise, make sure the 'else' block comes last.
+                    ..block around it. Otherwise, make sure the 'else' block comes last.
                 ")
             
             $code, add "\nelse\n    " ($action as lua)
             $else_allowed = (no)
         ..else:
             $code, add $clause " "
-            for $i in 1 to ((size of $line) - 1):
+            for $i in 1 to ((#$line) - 1):
                 if ($i > 1):
                     $code, add " or "
                 $code, add "\(mangle "branch value") == " ($line.$i as lua expr)
             $code, add " then\n    " ($action as lua)
             $clause = "\nelseif"
     
-    if ((size of "\$code") == 0):
+    if ((#"\$code") == 0):
         at $body fail ("
             Compile error: 'if' block has an empty body.
             Hint: This means nothing would happen, so the 'if' block should be deleted.

lib/core/math.nom

@@ -94,7 +94,7 @@ external:
             $prod *= $
         return $prod
     
-    [avg of $items, average of $items] all mean ((sum of $items) / (size of $items))
+    [avg of $items, average of $items] all mean ((sum of $items) / (#$items))
     
     # Min/max
     [min of $items, smallest of $items, lowest of $items] all mean:

lib/core/operators.nom

@@ -15,8 +15,7 @@ test:
 ($x <= $y) compiles to "(\($x as lua expr) <= \($y as lua expr))"
 ($x >= $y) compiles to "(\($x as lua expr) >= \($y as lua expr))"
 ($a == $b) compiles to "(\($a as lua expr) == \($b as lua expr))"
-[$a not= $b, $a != $b] all compile to
+[$a not= $b, $a != $b] all compile to "(\($a as lua expr) ~= \($b as lua expr))"
-    "(\($a as lua expr) ~= \($b as lua expr))"
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

lib/file_hash/init.nom

@@ -47,9 +47,9 @@ if $use_sha1:
         (hash $) means:
             $bytes = ($, bytes)
             $hash = ($bytes.1 << 7)
-            for $i in 2 to (size of $bytes):
+            for $i in 2 to (#$bytes):
                 $hash = ((1000003 * $hash) ~ $bytes.$i)
-            $hash = ($hash ~ (size of $bytes))
+            $hash = ($hash ~ (#$bytes))
             return "\$hash"
 
 external:

lib/tools/find.nom

@@ -60,7 +60,7 @@ command line program with $args:
         $file = (read file $filename)
         unless $file:
             fail "File does not exist: \$filename"
-        $code = (NomsuCode from ($Source $filename 1 (size of $file)) $file)
+        $code = (NomsuCode from ($Source $filename 1 (#$file)) $file)
         try:
             $tree = ($code parsed)
         ..if it fails with $msg:

lib/tools/repl.nom

@@ -34,8 +34,7 @@ command line program with $args:
         print if it's >0:
     (say results of (*extra arguments*)) means:
         $N = (select "#" (*extra arguments*))
-        if ($N == 0):
+        if ($N == 0): return
-            return
         for $ in 1 to $N:
             $ret = (select $ (*extra arguments*))
             if ($ret is "Text"):
@@ -50,7 +49,7 @@ command line program with $args:
             $line = ($io.read "*L")
             say (reset color) inline
             if (($line == "\n") or (not $line)):
-                if ((size of $buff) > 0):
+                if ((#$buff) > 0):
                     # clear the line
                     if $(COLOR ENABLED):
                         say "\027[1A\027[2K" inline
@@ -58,7 +57,7 @@ command line program with $args:
             $buff, add ($line, with "\t" -> "    ")
             say (dim (yellow ".. ")) inline
         --- (run buffer) ---
-        if ((size of $buff) == 0): stop
+        if ((#$buff) == 0): stop
         $buff = ($buff, joined)
         spoof file $buff
         try:
@@ -74,9 +73,7 @@ command line program with $args:
             say (dim "Comment:\($tree.1)")
             do next
         
-        if ($tree.type != "FileChunks"):
+        if ($tree.type != "FileChunks"): $tree = [$tree]
-            $tree = [$tree]
-
         for $chunk in $tree:
             try:
                 $lua = ($chunk as lua)

lib/tools/replace.nom

@@ -90,7 +90,7 @@ command line program with $args:
         $file = (read file $filename)
         unless $file:
             fail "File does not exist: \$filename"
-        $code = (NomsuCode from ($Source $filename 1 (size of $file)) $file)
+        $code = (NomsuCode from ($Source $filename 1 (#$file)) $file)
         try:
             $tree = ($code parsed)
         ..if it fails with $msg:

lib/tools/upgrade.nom

@@ -27,7 +27,7 @@ command line program with $args:
         unless $file:
             fail "File does not exist: \$filename"
         $leading_indent = ($file, matching "\n*([ ]*)")
-        $code = (NomsuCode from (Source $filename 1 (size of $file)) $file)
+        $code = (NomsuCode from (Source $filename 1 (#$file)) $file)
         $tree = ($code parsed $start_version)
         $uptree =
             $tree upgraded from ($start_version or ($tree.version or $(NOMSU VERSION))) to