Improve error reporting about unknown NCI datatypes and add a few more

letolabs · Jul 6, 2011 · 03a5234 · 03a5234
1 parent 52f58d5
commit 03a5234
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 
 nci:
 	echo '# THIS FILE IS GENERATED, edit ./bin/header2nci.pl to make changes here' > src/git2.nci ; \
+	perl ./bin/header2nci.pl /usr/local/include/git2.h >> src/git2.nci ; \
 	for i in /usr/local/include/git2/*; do  perl ./bin/header2nci.pl $$i >> src/git2.nci ; done
diff --git a/bin/header2nci.pl b/bin/header2nci.pl
@@ -69,7 +69,7 @@ sub process_gmph {
 
       #use Data::Dumper; warn Dumper [ $functions{$convenient_name} ];
     } else {
-        warn "Line does not match function definition: $_";
+        warn "Line $. in $filename does not match function definition: $_";
     }
   }
 

diff --git a/conf/c_to_nci_mappings.yml b/conf/c_to_nci_mappings.yml
@@ -15,6 +15,7 @@ char: p
 # 'p' types
 # since 't' is deprecated
 char *: p
+const void *: p
 const char *: p
 const char *git_dir: p
 const char *git_index_file: p
@@ -45,6 +46,7 @@ git_index_entry *: p
 const git_index_entry_unmerged *: p
 const git_tree_entry *: p
 const git_oid *: p
+const char objects_dir*: p
 git_signature *: p
 git_time_t: p
 git_odb_backend: p

diff --git a/src/git2.nci b/src/git2.nci
@@ -1,5 +1,5 @@
 # THIS FILE IS GENERATED, edit ./bin/header2nci.pl to make changes here
-v git_blob_rawcontent p # git_blob_rawcontent
+p git_blob_rawcontent p # git_blob_rawcontent
 i git_blob_create_fromfile p # git_blob_create_fromfile
 i git_blob_create_frombuffer p # git_blob_create_frombuffer
 i git_blob_rawsize p # git_blob_rawsize
@@ -62,7 +62,7 @@ v git_object_close p # git_object_close
 p git_object_type v # git_object_type
 p git_object_id v # git_object_id
 i git_odb_exists p # git_odb_exists
-v git_odb_object_data p # git_odb_object_data
+p git_odb_object_data p # git_odb_object_data
 i git_odb_read_prefix p # git_odb_read_prefix
 i git_odb_read p # git_odb_read
 i git_odb_object_size p # git_odb_object_size