daedalus-core 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88b4b37209072707c1e9b3d1512404f3bf7d6c19
-  data.tar.gz: 2a339fc1ce031a48f9cdde337222d258d433b6b1
+  metadata.gz: a6062bb9e0d98bf16f54127b8e21d9294f4e56c1
+  data.tar.gz: f67aef0682be44b26cccb52a7d8901f0fb467fec
 SHA512:
-  metadata.gz: 2fdd7ab10df0925fc984a914b78d86c5dfe5c582ade40d0ed92ccc1e0123d8208bd72e1aecb5522fb69bb12ad1a18a6b825bdd1424413fa753415043db14a7e7
-  data.tar.gz: fc0d43276ba10c105bd7912fc87607b22223578744dbad1a09bec0fa94468b8b9c0d3d2e4bc375383a1449ed2389baad918aceb01e8fe20de79b560209397335
+  metadata.gz: 5b6f4187ce6469758bdbd332c4de348155a0af8212652dad278ddf4703332a96f63a4f181e631f842e5db493d97820ad393697708b689e135238699ecaf25518
+  data.tar.gz: 15830e804c19c89e8df2b38dba98fba60fbe3eea04ff9f4a586021edd00fd19d5632f48aa4d0e94aef23ac41cc1a77baddbd693f655a254c7118f385cb3cbd08

data/lib/daedalus/dependency_grapher.rb

@@ -25,13 +25,53 @@ class DependencyGrapher
 
   class ExpressionEvaluator
     def initialize(expression)
-      @expression = expression
+      @expression = expression.strip
     end
 
-    # TODO: when melbourne is running in MRI, use it to parse
-    # the expression and then evaluate it.
     def evaluate(defines)
-      @expression == "0" ? false : true
+      # Stage1: find 'defined's and evaluate
+      #         replace defined with boolean evaluation value
+      @expression.gsub!(/(defined\(.+?\))/) { |expr|
+        defkey = expr.match(/\((.+?)\)/)[1]
+        if defines.include?(defkey)
+          'true'
+        else
+          'false'
+        end
+      }
+      # Stage2: scan macro-defined keywords
+      #         replace with actual value (true or false)
+      # this covers patterns like __clang__ and __x86_64__
+      @expression.gsub!(/__[A-Za-z0-9_]+__/) { |expr|
+        if defines.include?(expr)
+          defines[expr].to_s
+        elsif integer?(expr)
+          expr
+        else
+          '0'
+        end
+      }
+
+      # this covers other patters.
+      @expression.gsub!(/[A-Z0-9_]{4,}/) { |expr|
+        if defines.include?(expr)
+          defines[expr].to_s
+        elsif integer?(expr)
+          expr
+        else
+          '0'
+        end
+      }
+      # Stage3: Evaluate with ruby eval()
+      eval(@expression)
+    end
+
+    private
+    def integer?(str)
+      Integer(str)
+      true
+    rescue
+      false
     end
   end
 
@@ -252,7 +292,6 @@ class DependencyGrapher
   class Define < Node
     def initialize(macro, parser)
       super parser
-
       macro.strip!
       if index = macro.index(" ")
         @name = macro[0..index-1]
@@ -389,11 +428,22 @@ class DependencyGrapher
     def parse(lines)
       @line = 0
 
-      lines.each do |line|
-        @line += 1
-        m = line.match(/^\s*#(include|ifdef|ifndef|endif|else|define|undef|if|elif)(.*)$/)
+      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
+        end
 
-        # TODO: continue reading if line ends in \
+        m = inlined_line.match(/^\s*#(include|ifdef|ifndef|endif|else|define|undef|if|elif)(.*)$/)
 
         send :"process_#{m[1]}", m[2] if m
       end

data/lib/daedalus/version.rb

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

metadata

@@ -1,39 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: daedalus-core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :development
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
+  type: :development
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -82,9 +82,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 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