daedalus-core 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6062bb9e0d98bf16f54127b8e21d9294f4e56c1
-  data.tar.gz: f67aef0682be44b26cccb52a7d8901f0fb467fec
+  metadata.gz: a9fb9aedfd46997dffea225f86e7d01a57a80d14
+  data.tar.gz: cf5164dc1ec954d9ac2606730e8cc4bcff027e51
 SHA512:
-  metadata.gz: 5b6f4187ce6469758bdbd332c4de348155a0af8212652dad278ddf4703332a96f63a4f181e631f842e5db493d97820ad393697708b689e135238699ecaf25518
-  data.tar.gz: 15830e804c19c89e8df2b38dba98fba60fbe3eea04ff9f4a586021edd00fd19d5632f48aa4d0e94aef23ac41cc1a77baddbd693f655a254c7118f385cb3cbd08
+  metadata.gz: 58c034b22f6ddd91e56b2af56ed804807fe5c2f6b892de09660fd33a61abecc7aaea412abdff7d529e4ded1d1a1988f3432912a60f904d65d2a84450b5a48c67
+  data.tar.gz: 521380e15f3bdbb28a54f6e2ca453d08a32cde03d7597a6348f61507241f2f75600ce8fdff1fddbcd5352bad643a4fe8740f705391b3221118794b4cb68dc422

data/lib/daedalus/dependency_grapher.rb

@@ -292,6 +292,7 @@ class DependencyGrapher
   class Define < Node
     def initialize(macro, parser)
       super parser
+
       macro.strip!
       if index = macro.index(" ")
         @name = macro[0..index-1]
@@ -428,22 +429,23 @@ class DependencyGrapher
     def parse(lines)
       @line = 0
 
-      inlined_line = ""
-      unless lines.empty?
-        while (line = lines.shift.chomp(''))
-          @line += 1
-          line.rstrip!
-          if line.end_with?('\\')
-            # continue reading if line ends in \
-            inlined_line += line.chop
-          else
-            # stop reading
-            inlined_line += line
-            break
-          end
+      re = /^\s*#(include|ifdef|ifndef|endif|else|define|undef|if|elif)(.*)$/o
+      full_line = ""
+
+      lines.each do |line|
+        @line += 1
+
+        full_line.chomp!
+
+        if line[-2] == ?\\
+          full_line += line.chomp("\\\n") + "\n"
+          next
+        else
+          full_line += line
         end
 
-        m = inlined_line.match(/^\s*#(include|ifdef|ifndef|endif|else|define|undef|if|elif)(.*)$/)
+        m = full_line.match re
+        full_line = ""
 
         send :"process_#{m[1]}", m[2] if m
       end

data/lib/daedalus/version.rb

@@ -1,3 +1,3 @@
 module Daedalus
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: daedalus-core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :development
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+  name: rake
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
   type: :development
-  name: rspec
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+  name: rspec
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+  type: :development
 description: |
   Daedalus is a build system based on years of attempting to build Rubinus with a collection of Rake tasks. Rubinius is a complex system. It has dependencies on external C libraries (some of which are vendored), internal C/C++ libraries, Ruby C-extensions, and compiled Ruby code. The Rubinius bytecode compiler is written in Ruby, so we have to bootstrap compiling it.
 
@@ -82,10 +82,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Daedalus is a build system extracted from Rubinius. Almost no functionality
   has been implemented. This is very alpha.
 test_files: []
-has_rdoc: true