Re-organized project's source.

Neopallium · Neopallium · commit 2275892a5241 · 2011-02-18T11:24:04.000-08:00
Removed "GIT." prefix from error codes.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,7 +61,7 @@ set(LUA_GIT2_SRC
 )
 
 if(${USE_PRE_GENERATED_BINDINGS})
-	set(LUA_GIT2_SRC pre_generated-git2.nobj.c)
+	set(LUA_GIT2_SRC src/pre_generated-git2.nobj.c)
 else()
 	# Generate Lua bindings.
 	GenLuaNativeObjects(LUA_GIT2_SRC)
diff --git a/git2.nobj.lua b/git2.nobj.lua
@@ -6,7 +6,7 @@ hide_meta_info = false, --true,
 
 include "git2.h",
 
-package "GIT" {
+-- Error codes
 const "SUCCESS"        { 0 },
 const "ERROR"          { -1 },
 const "ENOTOID"        { -2 },
@@ -23,25 +23,24 @@ const "EFLOCKFAIL"     { -12 },
 const "EZLIB"          { -13 },
 const "EBUSY"          { -14 },
 const "EBAREINDEX"     { -15 },
-},
 
 subfiles {
-"repository.nobj.lua",
-"rawobject.nobj.lua",
-"oid.nobj.lua",
-"database.nobj.lua",
-"database_backend.nobj.lua",
-"index.nobj.lua",
-"index_entry.nobj.lua",
-"error.nobj.lua",
-"object.nobj.lua",
-"blob.nobj.lua",
-"signature.nobj.lua",
-"commit.nobj.lua",
-"tree.nobj.lua",
-"tree_entry.nobj.lua",
-"tag.nobj.lua",
-"revwalk.nobj.lua",
+"src/repository.nobj.lua",
+"src/rawobject.nobj.lua",
+"src/oid.nobj.lua",
+"src/database.nobj.lua",
+"src/database_backend.nobj.lua",
+"src/index.nobj.lua",
+"src/index_entry.nobj.lua",
+"src/error.nobj.lua",
+"src/object.nobj.lua",
+"src/blob.nobj.lua",
+"src/signature.nobj.lua",
+"src/commit.nobj.lua",
+"src/tree.nobj.lua",
+"src/tree_entry.nobj.lua",
+"src/tag.nobj.lua",
+"src/revwalk.nobj.lua",
 },
 }
 
diff --git a/src/blob.nobj.lua b/src/blob.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_blob Blob;
-]]
-
 object "Blob" {
+	c_source [[
+typedef git_blob Blob;
+]],
 	extends "Object",
 	constructor "new" {
 		var_in{"Repository *", "repo"},
diff --git a/src/commit.nobj.lua b/src/commit.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_commit Commit;
-]]
-
 object "Commit" {
+	c_source [[
+typedef git_commit Commit;
+]],
 	extends "Object",
 	constructor "new" {
 		var_in{"Repository *", "repo"},
diff --git a/src/database.nobj.lua b/src/database.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_odb Database;
-]]
-
 object "Database" {
+	c_source [[
+typedef git_odb Database;
+]],
 	constructor "new" {
 		var_out{"GitError", "err"},
 		c_source [[
diff --git a/src/database_backend.nobj.lua b/src/database_backend.nobj.lua
@@ -18,7 +18,8 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
+object "DatabaseBackend" {
+	c_source [[
 //typedef struct RawObject RawObject;
 #include <git2/odb_backend.h>
 
@@ -161,9 +162,7 @@ static void database_backend_free_cb(git_odb_backend *backend)
 	DatabaseBackend_unref(lua_backend);
 }
 
-]]
-
-object "DatabaseBackend" {
+]],
 	constructor {
 		var_in{"lua_State *", "L"},
 		c_source [[
diff --git a/src/error.nobj.lua b/src/error.nobj.lua
diff --git a/src/index.nobj.lua b/src/index.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_index Index;
-]]
-
 object "Index" {
+	c_source [[
+typedef git_index Index;
+]],
 	constructor "bare" {
 		var_in{"const char *", "index_path"},
 		var_out{"GitError", "err"},
diff --git a/src/index_entry.nobj.lua b/src/index_entry.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_index_entry IndexEntry;
-]]
-
 object "IndexEntry" {
+	c_source [[
+typedef git_index_entry IndexEntry;
+]],
 	const "NAMEMASK" { 0x0fff },
 	const "STAGEMASK" { 0x3000 },
 	const "EXTENDED" { 0x4000 },
diff --git a/src/object.nobj.lua b/src/object.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_object Object;
-]]
-
 object "Object" {
+	c_source [[
+typedef git_object Object;
+]],
 	dyn_caster {
 		caster_type = "switch",
 		value_function = "git_object_type",
diff --git a/src/oid.nobj.lua b/src/oid.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_oid OID;
-]]
-
 object "OID" {
+	c_source [[
+typedef git_oid OID;
+]],
 	userdata_type = 'simple',
 	constructor "str" {
     var_in{"const char *", "hex"},
diff --git a/src/pre_generated-git2.nobj.c b/src/pre_generated-git2.nobj.c
diff --git a/src/rawobject.nobj.lua b/src/rawobject.nobj.lua
@@ -18,7 +18,8 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
+object "RawObject" {
+	c_source [[
 typedef struct RawObject {
 	git_rawobj git;
 	int ref;
@@ -54,32 +55,30 @@ static void RawObject_from_git_rawobj(lua_State *L, RawObject *raw, git_rawobj *
 	}
 }
 
-]]
-
-object "RawObject" {
+]],
 	userdata_type = 'embed',
 	default = 'NULL',
-	constructor "header" {
+	constructor "new" {
 		var_in{"const char *", "type"},
-		var_in{"size_t", "len"},
+		var_in{"const char *", "data"},
 		c_source [[
 	RawObject raw; /* temp. storage, this gets copied. */
 	${this} = &(raw);
-	raw.git.data = NULL;
-	raw.git.len = ${len};
 	raw.git.type = git_object_string2type(${type});
 	raw.ref = LUA_REFNIL;
+	RawObject_set_data_and_ref(L, &raw, ${data}, ${data}_len, ${data::idx});
 ]],
 	},
-	constructor "new" {
+	constructor "header" {
 		var_in{"const char *", "type"},
-		var_in{"const char *", "data"},
+		var_in{"size_t", "len"},
 		c_source [[
 	RawObject raw; /* temp. storage, this gets copied. */
 	${this} = &(raw);
+	raw.git.data = NULL;
+	raw.git.len = ${len};
 	raw.git.type = git_object_string2type(${type});
 	raw.ref = LUA_REFNIL;
-	RawObject_set_data_and_ref(L, &raw, ${data}, ${data}_len, ${data::idx});
 ]],
 	},
 	destructor "close" {
diff --git a/src/repository.nobj.lua b/src/repository.nobj.lua
@@ -18,12 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_repository Repository;
-
-]]
-
 object "Repository" {
+	c_source [[
+typedef git_repository Repository;
+]],
 	constructor "open" {
 		var_in{"const char *", "path"},
 		var_out{"GitError", "err"},
diff --git a/src/revwalk.nobj.lua b/src/revwalk.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_revwalk RevWalk;
-]]
-
 object "RevWalk" {
+	c_source [[
+typedef git_revwalk RevWalk;
+]],
 	extends "Object",
 	const "SORT_NONE"        { 0x00 },
 	const "SORT_TOPOLOGICAL" { 0x01 },
diff --git a/src/signature.nobj.lua b/src/signature.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_signature Signature;
-]]
-
 object "Signature" {
+	c_source [[
+typedef git_signature Signature;
+]],
 	constructor {
 		c_call "Signature *" "git_signature_new"
 			{ "const char *", "name", "const char *", "email", "time_t", "time", "int", "offset" },
diff --git a/src/tag.nobj.lua b/src/tag.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_tag Tag;
-]]
-
 object "Tag" {
+	c_source [[
+typedef git_tag Tag;
+]],
 	extends "Object",
 	constructor "new" {
 		var_in{"Repository *", "repo"},
diff --git a/src/tree.nobj.lua b/src/tree.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_tree Tree;
-]]
-
 object "Tree" {
+	c_source [[
+typedef git_tree Tree;
+]],
 	extends "Object",
 	constructor "new" {
 		var_in{"Repository *", "repo"},
diff --git a/src/tree_entry.nobj.lua b/src/tree_entry.nobj.lua
@@ -18,11 +18,10 @@
 -- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 -- THE SOFTWARE.
 
-c_source [[
-typedef git_tree_entry TreeEntry;
-]]
-
 object "TreeEntry" {
+	c_source [[
+typedef git_tree_entry TreeEntry;
+]],
 	method "name" {
 		c_call "const char *" "git_tree_entry_name" {}
 	},
diff --git a/tests/test_backend.lua b/tests/test_backend.lua
diff --git a/tests/test_rep.git.tbz b/tests/test_rep.git.tbz
diff --git a/tests/test_rep.lua b/tests/test_rep.lua

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ set(LUA_GIT2_SRC`
`61`	`61`	`)`
`62`	`62`
`63`	`63`	`if(${USE_PRE_GENERATED_BINDINGS})`
`64`		`- set(LUA_GIT2_SRC pre_generated-git2.nobj.c)`
	`64`	`+ set(LUA_GIT2_SRC src/pre_generated-git2.nobj.c)`
`65`	`65`	`else()`
`66`	`66`	`# Generate Lua bindings.`
`67`	`67`	`GenLuaNativeObjects(LUA_GIT2_SRC)`