turtle/tlang: numerous fixes for .indexing

Lua interface now supports it
The access/assign functions now use indexing by default
Things that deal with indexed stuff now assume its a table rather than a string

clientmods/turtle/init.lua

@@ -325,7 +325,7 @@ end
 
 local quarry_tlang = [[
 # turtle.builtins: mine advance v3add descend rotate relativize swapg rectify
-# tlang operators: // .elem
+# tlang operators: //
 
 ################################
 # Mine ahead length nodes (including head and feet)

clientmods/turtle/tlang.lua

@@ -22,7 +22,7 @@ local function merge_tables(l1, l2)
 end
 
 local function load_api_file(file)
-    tlang = merge_tables(tlang, dofile(prefix .. file))
+    loadfile(prefix .. file)(tlang)
 end
 
 load_api_file("tlang_lex.lua")
@@ -87,7 +87,7 @@ function tlang.exec(code)
 end
 
 function tlang.pretty_pc(pc)
-    return tostring(pc.sg) .. ";" .. tostring(pc.pos) .. ";" .. tostring(pc.elem)
+    return tostring(pc.sg) .. ";" .. table.concat(pc.pos, ".") .. ";" .. tostring(pc.elem)
 end
 
 function tlang.format_table(t, depth, maxdepth)
@@ -243,7 +243,13 @@ local function test()
         .a print
     ]]
 
-    local test = mapdot_test
+    local funcfunc_test = [[
+    {dup *} `square =
+    {dup square *} `cube =
+    5 cube print
+    ]]
+
+    local test = funcfunc_test
 
     --tlang.print_table(tlang.lex(test))
     --tlang.print_table(tlang.parse(tlang.lex(test)))

clientmods/turtle/tlang_lex.lua

@@ -1,6 +1,6 @@
 -- CC0/Unlicense Emilia 2020
 
-local tlang = {}
+local tlang = ...
 
 local function in_list(value, list)
     for k, v in ipairs(list) do
@@ -343,5 +343,3 @@ function tlang.lex(code)
         end
     end
 end
-
-return tlang

clientmods/turtle/tlang_parse.lua

@@ -11,7 +11,7 @@ number
 symbol
 --]]
 
-local tlang = {}
+local tlang = ...
 
 local internal = {}
 
@@ -206,5 +206,3 @@ function tlang.parse(lexed)
         end
     end
 end
-
-return tlang

clientmods/turtle/tlang_vm.lua

@@ -1,6 +1,6 @@
 -- CC0/Unlicense Emilia 2020
 
-local tlang = {}
+local tlang = ...
 
 local function in_list(value, list)
     for k, v in ipairs(list) do
@@ -114,6 +114,10 @@ function tlang.call_tos(state)
 end
 
 function tlang.call_var(state, name)
+    if type(name) ~= "table" then
+        name = {name}
+    end
+
     tlang.call(state, {sg = 1, pos = name, elem = 1})
 end
 
@@ -157,13 +161,6 @@ local function find_var_pos(state, name)
     end
 end
 
-function tlang.near_access(state, name)
-    local n = find_var_pos(state, name)
-    if n then
-        return state.locals[n].vars[name]
-    end
-end
-
 function tlang.map_access_assign(state, index, start, assign)
     local container
     local curtab
@@ -177,6 +174,8 @@ function tlang.map_access_assign(state, index, start, assign)
         -- assignments can go at the current scope
         if assign then
             pos = pos or #state.locals
+        elseif not pos then
+            return nil -- ERROR, variable undefined
         end
 
         container = state.locals[pos].vars
@@ -214,29 +213,28 @@ function tlang.map_access_assign(state, index, start, assign)
     end
 end
 
-function tlang.near_access_indexed(state, index)
+function tlang.near_access(state, index)
     return tlang.map_access_assign(state, index)
 end
 
-function tlang.near_assign_indexed(state, index, value)
+function tlang.near_assign(state, index, value)
     tlang.map_access_assign(state, index, nil, value)
 end
 
-function tlang.global_assign(state, name, value)
+function tlang.global_access(state, index)
-    state.locals[0].vars[name] = value
+    tlang.map_access_assign(state, index, state.locals[1].vars)
 end
 
-function tlang.local_assign(state, name, value)
+function tlang.global_assign(state, index, value)
-    state.locals[#state.locals].vars[name] = value
+    tlang.map_access_assign(state, index, state.locals[1].vars, value)
 end
 
-function tlang.near_assign(state, name, value)
+function tlang.local_access(state, index)
-    local n = find_var_pos(state, name)
+    tlang.map_access_assign(state, index, state.locals[#state.locals].vars)
-    if n then
+end
-        state.locals[n].vars[name] = value
+
-    else
+function tlang.local_assign(state, index, value)
-        state.locals[#state.locals].vars[name] = value
+    tlang.map_access_assign(state, index, state.locals[#state.locals].vars, value)
-    end
 end
 
 function tlang.get_pc(state)
@@ -248,7 +246,7 @@ local function accesspc(state, pc)
     if pc.sg == 0 then -- stack
         code = state.code_stack[pc.pos]
     elseif pc.sg == 1 then -- global
-        code = tlang.near_access_indexed(state, pc.pos)
+        code = tlang.near_access(state, pc.pos)
     end
 
     if code then
@@ -373,7 +371,7 @@ tlang.builtins["="] = function(state)
     local name = statepop_type(state, "quote")
     local value = tlang.pop_raw(state)
 
-    tlang.near_assign_indexed(state, name.value, value)
+    tlang.near_assign(state, name.value, value)
 end
 
 function tlang.unary(func)
@@ -383,7 +381,7 @@ function tlang.unary(func)
             statepush_num(state, func(tos.value))
         elseif tos.type == "quote" then
             local n = tlang.near_access(state, tos.value)
-            tlang.near_assign_indexed(state, tos.value, {type = "number", value = func(n.value)})
+            tlang.near_assign(state, tos.value, {type = "number", value = func(n.value)})
         end
     end
 end
@@ -706,8 +704,12 @@ function tlang.step(state)
     local cur = getnext(state)
 
     if cur == nil then
-        state.finished = true
+        if state.locals[1].nextpop then
-        return false
+            state.finished = true
+            return false
+        else
+            return "Error: code exited early"
+        end
     else
         state.finished = false
     end
@@ -724,7 +726,7 @@ function tlang.step(state)
             local f = state.builtins[strname]
             f(state)
         else
-            local var = tlang.near_access_indexed(state, cur.value)
+            local var = tlang.near_access(state, cur.value)
             if var == nil then
                 return "Undefined identifier: " .. table.concat(cur.value, ".")
             elseif var.type == "code" then
@@ -737,5 +739,3 @@ function tlang.step(state)
 
     return true
 end
-
-return tlang