take 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd7fcbfad25e72bc99e09158ce86f8b529e75b1c
-  data.tar.gz: 07763bf83c6d5cb7aaab57139df50a7bc9be273c
+  metadata.gz: f0dd40278e101af1c56a63ba7fd15b6a07f1fbd5
+  data.tar.gz: 6e584d10586014e16b539ef49025407810a8e856
 SHA512:
-  metadata.gz: 93dada6629d166017c0503c44d8d723af019c60b562896a736bb4f4ba1cb3eccec5293d635c737e56c13898cd74948f9cbe58316317075b70222da2322d2eefb
-  data.tar.gz: 97360d4ed97417075bf93c0a9cc9d93d3c885f90b7d7cbb5ee088f90c1fba7d6cc59125f0b06b1ae492a26395ab14cad928939eedd9bb1ccb94e0ef8710e3108
+  metadata.gz: eff9b00d672abf0748ea3023a85b431c0ee95cda810ad0a6c78131dfbb6441681d9a22cd900ca1b05e49077c0c217b71b7a039e48d41d827670c9007710f4105
+  data.tar.gz: eee7c6b5424714509702d47a832f7db9f976ac829918aa5fc15f9297e73ba2d3821f9eca5c5a5767f244dd356a0741e0a253576dce51023f1f30655ca8a802e9

data/lib/take/unit/compiler.rb

@@ -15,12 +15,15 @@ module Take
 
       def compile
         @parent ||= begin
-          @parent = AST::Parent.new(name: @file.
-            gsub(/\..*\z/, "").gsub(/[\W]/, "_"))
+          @parent = AST::Parent.new(name: File.basename(@file).
+            gsub(/\..*\z/, ""))
           while peek do
-            @parent.children << compile_group
+            part = predict(:group => :group, :prefix => :prefix)
+            @parent.children << part if part
           end
 
+          add_parent_prefix
+
           @parent.source = sourcify([0, 0])
           @parent
         end
@@ -45,7 +48,6 @@ module Take
                 :test   => :test,
                 :before => :before,
                 :after  => :after,
-                :prefix => :prefix,
                 :macro  => :macro
       end
 
@@ -114,6 +116,19 @@ module Take
         hash.merge(file: @file)
       end
 
+      def add_parent_prefix
+        prefix = AST::Prefix.new(name: "_generated_prefix")
+
+        prefix.children << AST::Block.new(body: <<-DOC)
+
+#define __FILE \"#{@file}\"
+#include \"utest.h\"
+static size_t tests = 0;
+static size_t failed = 0;
+DOC
+        @parent.children << prefix
+      end
+
     end
   end
 end

data/lib/take/unit/generator.rb

@@ -6,6 +6,7 @@ module Take
         @parent  = parent
         @groups  = [@parent]
         @options = options
+        @group_functions = []
       end
 
       def generate
@@ -48,26 +49,56 @@ module Take
         group.children.select(&:test?).
           each { |child| walk(child) }
 
-        @output << "// group #{group_name}\n"
-        @output << "void group_#{group_name}()\n{\n"
-        befores.each { |child| walk(child) }
+        @group_functions << "group_#{group_name}"
+
+        @output << <<-CODE
+// group #{group_name}
+void group_#{group_name}()
+{
+
+  output(TEXT_COLOR_MAGENTA "\\tSET \\"" TEXT_COLOR_BOLD_MAGENTA
+    "#{group_name}" TEXT_COLOR_MAGENTA "\\":\\n");
+CODE
         @output << group.children.select(&:test?).
           map { |child| "  test_#{group_name(child)}();" }.
           join("\n")
         @output << "\n"
-        afters.each { |child| walk(child) }
         @output << "}\n\n"
         @groups.pop
       end
 
       def walk_test(node)
-        @output << "void test_#{group_name(node)}()\n{\n"
+        @output << <<-CODE
+void test_#{group_name(node)}()
+{
+  tests++;
+  int test_success = 1;
+  output(TEXT_COLOR_MAGENTA "\\t\\tTEST \\"" TEXT_COLOR_BOLD_MAGENTA
+    "#{node.name}" TEXT_COLOR_MAGENTA "\\": ");
+
+CODE
+        befores.each { |child| walk(child) }
         node.children.select(&:block?).each { |child| walk(child) }
-        @output << "}\n\n"
+        afters.each { |child| walk(child) }
+        @output << <<-CODE
+
+  if(test_success)
+  {
+#ifdef VERBOSE
+    output("\\n\\t\\t\\t" TEXT_COLOR_GREEN "OK\\n");
+#else
+    output(TEXT_COLOR_BOLD_GREEN "OK\\n");
+#endif
+  }
+}
+CODE
       end
 
       def walk_block(node, indent = 2)
-        @output << "#line \"#{node.source.file}\" #{node.source.line + 2}"
+        if node.source
+          @output << "#line #{node.source.line + 2}" \
+            " \"#{node.source.file}\""
+        end
         lines = node.body.each_line
         deindent = if scan = node.body.scan(/^[ \t]*(?=\S)/).min
           scan.size
@@ -76,7 +107,8 @@ module Take
         end
 
         body = lines.map { |l| l.gsub(/^[ \t]{#{deindent}}/, "") }.
-          map { |l| (" " * indent) << l }.join("").rstrip.gsub(/^[ \t]+$/, "")
+          map { |l| (" " * indent) << l }.join("").rstrip.
+          gsub(/^[ \t]+$/, "")
 
         @output << body << "\n"
         reset
@@ -85,6 +117,28 @@ module Take
       def walk_parent(node)
         node.children.select(&:prefix?).each { |child| walk(child) }
         node.children.reject(&:prefix?).each { |child| walk(child) }
+        @output << <<-CODE
+int main()
+{
+  output(TEXT_COLOR_MAGENTA "FILE \\"" TEXT_COLOR_BOLD_MAGENTA
+    __FILE TEXT_COLOR_MAGENTA "\\":\\n");
+
+CODE
+
+        @group_functions.each { |func| @output << "  #{func}();\n" }
+
+        @output << <<-CODE
+  output2("\\n\\t" TEXT_COLOR_MAGENTA "RESULT:\\n\\t\\t"
+    "PASSED: " TEXT_COLOR_BOLD_MAGENTA "%zu"
+    TEXT_COLOR_MAGENTA "\\n\\t\\tFAILED: "
+    TEXT_COLOR_BOLD_MAGENTA "%zu" TEXT_COLOR_MAGENTA
+    "\\n", tests - failed, failed);
+
+  return TEST_RETURN;
+}
+
+CODE
+
       end
 
       def walk_node(node)
@@ -116,7 +170,7 @@ module Take
       end
 
       def reset
-        @output << "#line \"#{@parent.name}.c\" #{line}\n"
+        @output << "#line #{line} \"#{@parent.name}.c\"\n"
       end
 
       def befores

data/lib/take/unit.rb

@@ -15,7 +15,7 @@ module Take
       compiler = Compiler.new(file.path, scanner.scan)
       generator = Generator.new(compiler.compile,
         directory: File.dirname(file.path)).tap(&:generate)
-      generator.write_file(file.path.gsub(/\..*\z/, ".c")
+      generator.write_file(file.path.gsub(/\..*\z/, ".c"))
     end
 
   end

data/lib/take/version.rb

@@ -1,3 +1,3 @@
 module Take
-  VERSION = "0.0.7".freeze
+  VERSION = "0.0.8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: take
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jeremy Rodi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler