From 975ff3f9429e9a7c2872a360fb2cfa3585cd668a Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Thu, 26 Nov 2015 19:45:13 -0800 Subject: [PATCH] make only the assemble function visible --- lips.lua | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/lips.lua b/lips.lua index 84d91f7..6f24a82 100644 --- a/lips.lua +++ b/lips.lua @@ -1477,12 +1477,13 @@ function Dumper:dump() end end -local function assemble(fn_or_asm, writer, options) +function assembler.assemble(fn_or_asm, writer, options) -- assemble MIPS R4300i assembly code. -- if fn_or_asm contains a newline; treat as assembly, otherwise load file. -- returns error message on error, or nil on success. fn_or_asm = tostring(fn_or_asm) writer = writer or io.write + options = options or {} function main() local fn = nil @@ -1503,7 +1504,7 @@ local function assemble(fn_or_asm, writer, options) return parser:parse(asm) end - if options and options.unsafe then + if options.unsafe then return main() else local ok, err = pcall(main) @@ -1512,18 +1513,7 @@ local function assemble(fn_or_asm, writer, options) end return setmetatable(assembler, { - __call = function(_, ...) - return assemble(...) + __call = function(self, ...) + return self.assemble(...) end, - - Lexer = Lexer, - Parser = Parser, - Dumper = Dumper, - - registers = registers, - fpu_registers = fpu_registers, - all_registers = all_registers, - instructions = instructions, - all_instructions = all_instructions, - all_directives = all_directives, })