conyard 0.1.2 → 0.1.3

data/Rakefile

@@ -4,7 +4,6 @@
 require 'rubygems' if RUBY_VERSION < '1.9'
 require 'rake'
 require 'erb'
-require 'yaml'
 
 $CC = 'clang'
 $CXX = 'clang++'

data/structure-kits/vector/vector.c.erb

@@ -0,0 +1,103 @@
+//! Created by Chris Miller on 24 December 2009.
+//! Copyright 2009-2011 Chris Miller. All rights reserved.
+
+//! This file is generated; modifying it is totally OK, but
+//! your modifications might get removed if this file is
+//! regenerated again. I would suggest putting re-implementations
+//! and/or extensions in another file.
+
+#include "<%= @outfile.pathmap("%f") %>.gen.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+float __<%= @name %>_growth = 2.0f;
+
+struct <%= @name %>* <%= @name %>_create(const register size_t capacity) {
+    struct <%= @name %>* v = (struct <%= @name %>*)malloc(sizeof(struct <%= @name %>));
+    v->data = (<%= @type %>*)malloc(sizeof(<%= @type %>)*capacity);
+    v->length = 0;
+    v->capacity = capacity;
+    return v;
+}
+void <%= @name %>_free(struct <%= @name %>* v) {
+    free(v->data);
+    free(v);
+}
+void <%= @name %>_free_with_block(struct <%= @name %>* v, void(^block)(<%= @type %>)) {
+    for (size_t i=0; i<v->length; ++i)
+        block(v->data[i]);
+    free(v->data);
+    free(v);
+}
+void <%= @name %>_grow(struct <%= @name %>* v) {
+    register size_t new_capacity = v->capacity * __<%= @name %>_growth;
+    v-> data = (<%= @type %>*)realloc(v->data,
+        (size_t)(sizeof(<%= @type %>) * new_capacity));
+    v->capacity = new_capacity;
+}
+void <%= @name %>_grow_to(struct <%= @name %>* v, register size_t s) {
+    v->data = (<%= @type %>*)realloc(v->data, (size_t)(sizeof(<%= @type %>) * s));
+    v->capacity = s;
+}
+void <%= @name %>_shrink(struct <%= @name %>* v) {
+    <%= @name %>_grow_to(v, v->size);
+}
+void <%= @name %>_push_back(struct <%= @name %>* v, const <%= @type %> t) {
+    if (v->capacity <= v->length)
+        <%= @name %>_grow(v);
+    v->data[v->length ++] = t;
+}
+<%= @type %> <%= @name %>_pop_back(struct <%= @name %>* v) {
+    return v->data[-- v->length];
+}
+void <%= @name %>_insert(struct <%= @name %>* v,
+                         register const size_t idx,
+                         const <%= @type %> t) {
+    if(v->capacity <= v->length)
+        <%= @name %>_grow(v);
+    memmove(v->data+idx+1, v->data+idx, sizeof(t) * (v->length - idx));
+    ++ v->length;
+    v->data[idx] = t;
+}
+void <%= @name %>_insert_range(struct <%= @name %>* v,
+                               register const size_t idx,
+                               <%= @type %>* begin,
+                               <%= @type %>* end) {
+    register size_t a1 = end - begin;
+    register size_t a2 = a1 + v->length;
+    if(v->capacity <= a2)
+        <%= @name %>_grow_to(v, a2);
+    memmove(v->data+idx+a1, v->data+idx, sizeof(<%= @type %>) * (v->length - idx));
+    memcpy(v->data+idx, begin, sizeof(<%= @type %>) * a1);
+    v->length += a1;
+}
+void <%= @name %>_remove_range(struct <%= @name %>* v,
+                               register const size_t begin,
+                               register const size_t end) {
+    <%= @type %>* tmp = (<%= @type %>*)calloc(v->length - end, sizeof(<%= @type %>));
+    memcpy(tmp, v->data+end, sizeof(<%= @type %>) * (v->length - end));
+    memcpy(v->data+begin, tmp, sizeof(<%= @type %>) * (v->length - end));
+    v->length -= end - begin;
+    free(tmp);
+}
+void <%= @name %>_remove_range_with_block(struct <%= @name %>* v,
+                                          register const size_t begin,
+                                          register const size_t end,
+                                          void(^block)(<%= @type %>)) {
+    <%= @type %>* tmp = (<%= @type %>*)calloc(v->length - end, sizeof(<%= @type %>));
+    memcpy(tmp, v->data+end, sizeof(<%= @type %>) * (v->length - end));
+    memcpy(v->data+begin, tmp, sizeof(<%= @type %>) * (v->length - end));
+    for (register size_t i=0; i<v->length-end; ++i)
+        block(tmp[i]);
+    v->length -= end - begin;
+    free(tmp);
+}
+void <%= @name %>_remove(struct <%= @name %>* v, register const size_t idx) {
+    <%= @name %>_remove_range(v, idx, idx+1);
+}
+
+#ifdef __cplusplus
+}
+#endif

data/structure-kits/vector/vector.h.erb

@@ -0,0 +1,53 @@
+//! Created by Chris Miller on 24 December 2009.
+//! Copyright 2009-2011 Chris Miller. All rights reserved.
+
+//! This file is generated; modifying it is totally OK, but
+//! your modifications might get removed if this file is
+//! regenerated again. I would suggest putting re-implementations
+//! and/or extensions in another file.
+
+#ifndef __<%= @guard %>_H__
+#define __<%= @guard %>_H__
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * This defines how much the vector will grow when it needs to expand. By default, this is `2.0f`.
+ */    
+extern
+float __<%= @name %>_growth;
+
+struct <%= @name %> {
+    <%= @type %>* data;
+    union {
+        size_t length;
+        size_t size;
+    };
+    size_t capacity;
+};
+
+struct <%= @name %>* <%= @name %>_create(const register size_t capacity);
+void <%= @name %>_free(struct <%= @name %>* v);
+void <%= @name %>_free_with_block(struct <%= @name %>* v, void(^block)(<%= @type %>));
+void <%= @name %>_grow(struct <%= @name %>* v);
+void <%= @name %>_grow_to(struct <%= @name %>* v, register size_t s);
+void <%= @name %>_shrink(struct <%= @name %>* v);
+void <%= @name %>_push_back(struct <%= @name %>* v, const <%= @type %> t);
+<%= @type %> <%= @name %>_pop_back(struct <%= @name %>* v);
+void <%= @name %>_insert(struct <%= @name %>* v, register const size_t idx, const <%= @type %> t);
+void <%= @name %>_insert_range(struct <%= @name %>* v, register const size_t idx, <%= @type %>* begin, <%= @type %>* end);
+void <%= @name %>_remove_range(struct <%= @name %>* v, register const size_t begin, register const size_t end);
+void <%= @name %>_remove_range_with_block(struct <%= @name %>* v, register const size_t begin, register const size_t end, void(^block)(<%= @type %>));
+void <%= @name %>_remove(struct <%= @name %>* v, register const size_t idx);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

data/structure-kits/vector/vector.rake

@@ -0,0 +1,24 @@
+def emit_vector name, datatype, outfile
+  @name = name
+  @type = datatype
+  @outfile = File.expand_path outfile
+  @guard = outfile.pathmap("%n").gsub(/\-/,'_').upcase
+  
+  headertmpl = 'structure-kits/vector/vector.h.erb'
+  impltmpl = 'structure-kits/vector/vector.c.erb'
+  
+  ofh=File.new(@outfile+".gen.h", "w")
+  ofh.write(ERB.new(File.read(headertmpl)).result)
+  ofh.close
+  ofi=File.new(@outfile+".gen.c", "w")
+  ofi.write(ERB.new(File.read(impltmpl)).result)
+  ofi.close
+end
+
+namespace :generate do
+  desc "Creates a new fast, lean C vector implementation; useage is: rake vector[name, type, outfile]"
+  task :vector, :name, :datatype, :outfile do |t, args|
+    args.with_defaults(:name => 'int_vector', :datatype => 'int', :outfile => 'int_vector')
+    emit_vector args.name, args.datatype, File.expand_path(args.outfile)
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Christopher Miller
@@ -38,8 +38,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- tests/vector/vector_test.c
-- tests/vector/vector_test.rake
+- structure-kits/vector/vector.c.erb
+- structure-kits/vector/vector.h.erb
+- structure-kits/vector/vector.rake
 - bin/conyard
 - Rakefile
 - README.md

data/tests/vector/vector_test.c

@@ -1,18 +0,0 @@
-//! Created by Chris Miller on 10 October 2011.
-//! Copyright 2011 Chris Miller. All rights reserved.
-
-#include <stdio.h>
-
-#include "int_vector.gen.h"
-
-int main(int argc, char **argv) {
-    printf("Creating vector... \n");
-    struct int_vector* v = int_vector_create(10);
-    for (int i=0; i<10; ++i) {
-        int_vector_push_back(v, i);
-        printf("  Added element %d to vector\n", i);
-    }
-    int_vector_free(v);
-    printf("Freed vector.\n");
-    return 0;
-}

data/tests/vector/vector_test.rake

@@ -1,11 +0,0 @@
-namespace :test do
-  task :vector do
-    Rake::Task['run'].invoke 'tests/vector/vector_test.genconfig'
-    src = [ 'tests/vector/int_vector.gen.c', 'tests/vector/vector_test.c' ]
-    src.each do |src_file|
-      sh "#{$CC} -x c -arch x86_64 -std=gnu99 -fblocks -c #{File.expand_path src_file} -o #{File.expand_path 'tests/vector/'+src_file.pathmap('%n')}.o"
-    end
-    sh "#{$CC} -arch x86_64 -o #{File.expand_path 'tests/vector/vector'} #{File.expand_path 'tests/vector/int_vector.gen.o'} #{File.expand_path 'tests/vector/vector_test.o'}"
-    sh File.expand_path('tests/vector/vector')
-  end
-end