From 70cb74b4d65851ef69240d35b58d9f8d20a73ed1 Mon Sep 17 00:00:00 2001 From: "Benjamin P. Jung" Date: Thu, 27 Aug 2015 15:50:46 +0200 Subject: [PATCH 1/3] Migrate CVS project to Git --- .cvsignore => .gitignore | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename .cvsignore => .gitignore (65%) diff --git a/.cvsignore b/.gitignore similarity index 65% rename from .cvsignore rename to .gitignore index 908e4e3e..d7642856 100644 --- a/.cvsignore +++ b/.gitignore @@ -1,8 +1,8 @@ -bin -target -build -lib -jit +bin/ +target/ +build/ +lib/ +jit/ *.ser *.gz *.jar -- 2.49.1 From 4d4a040a6bb7704682b24cac51dde75d072b4e13 Mon Sep 17 00:00:00 2001 From: "Benjamin P. Jung" Date: Fri, 26 Jan 2018 22:44:04 +0100 Subject: [PATCH 2/3] Rename README.html to README.md and add notice. To make sure that everyone knows immediately how this repository happend to be created, I felt that it might be a good idea to add a short notice about the project's heritage. --- README.html => README.md | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) rename README.html => README.md (98%) diff --git a/README.html b/README.md similarity index 98% rename from README.html rename to README.md index cd0f790a..f289746f 100644 --- a/README.html +++ b/README.md @@ -1,21 +1,18 @@ - - +# This is a fork! +
+This repository has been forked from the original CVS sources of Luaj. +The commit history has been converted to make sure that the original work of +James Roseborough and Ian Farmer is not lost. +Unfortunately, I was not able to contact either James or Ian to hand over +ownership of the Github organization/repo as I have originally intended to. +The community however seems interested enough to continue work on the original +sources and therefore I have decided to make sure that any useful pull requests +that may add some value to the original code base shall be merged in from now +on.
+-- Benjamin P. Jung, Jan. 26th 2018 +
- -Getting Started with LuaJ - - - - - - -
-

- - -Getting Started with LuaJ - -

+

Getting Started with LuaJ

James Roseborough, Ian Farmer, Version 3.0.1

-- 2.49.1 From 3b71b31c363793626cfbde38de311769041c43cf Mon Sep 17 00:00:00 2001 From: Enyby Date: Mon, 2 Jul 2018 01:54:24 +0300 Subject: [PATCH 3/3] Fix for proper print OP_SETLIST additional opcode #7 --- src/core/org/luaj/vm2/Print.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/core/org/luaj/vm2/Print.java b/src/core/org/luaj/vm2/Print.java index 5c8b55dd..3c9c570b 100644 --- a/src/core/org/luaj/vm2/Print.java +++ b/src/core/org/luaj/vm2/Print.java @@ -152,7 +152,7 @@ public class Print extends Lua { int[] code = f.code; int pc, n = code.length; for (pc = 0; pc < n; pc++) { - printOpCode(f, pc); + pc = printOpCode(f, pc); ps.println(); } } @@ -161,9 +161,10 @@ public class Print extends Lua { * Print an opcode in a prototype * @param f the {@link Prototype} * @param pc the program counter to look up and print + * @return pc same as above or changed */ - public static void printOpCode(Prototype f, int pc) { - printOpCode(ps,f,pc); + public static int printOpCode(Prototype f, int pc) { + return printOpCode(ps,f,pc); } /** @@ -171,8 +172,9 @@ public class Print extends Lua { * @param ps the {@link PrintStream} to print to * @param f the {@link Prototype} * @param pc the program counter to look up and print + * @return pc same as above or changed */ - public static void printOpCode(PrintStream ps, Prototype f, int pc) { + public static int printOpCode(PrintStream ps, Prototype f, int pc) { int[] code = f.code; int i = code[pc]; int o = GET_OPCODE(i); @@ -282,7 +284,7 @@ public class Print extends Lua { break; case OP_SETLIST: if (c == 0) - ps.print(" ; " + ((int) code[++pc])); + ps.print(" ; " + ((int) code[++pc]) + " (stored in the next OP)"); else ps.print(" ; " + ((int) c)); break; @@ -292,6 +294,7 @@ public class Print extends Lua { default: break; } + return pc; } private static int getline(Prototype f, int pc) { -- 2.49.1