daedalus-core 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9fb9aedfd46997dffea225f86e7d01a57a80d14
-  data.tar.gz: cf5164dc1ec954d9ac2606730e8cc4bcff027e51
+  metadata.gz: 327e0c902f3cd052f4b41bf0255f058148960209
+  data.tar.gz: f21877accdf61bc6f2acb276ae56d27bd254ac21
 SHA512:
-  metadata.gz: 58c034b22f6ddd91e56b2af56ed804807fe5c2f6b892de09660fd33a61abecc7aaea412abdff7d529e4ded1d1a1988f3432912a60f904d65d2a84450b5a48c67
-  data.tar.gz: 521380e15f3bdbb28a54f6e2ca453d08a32cde03d7597a6348f61507241f2f75600ce8fdff1fddbcd5352bad643a4fe8740f705391b3221118794b4cb68dc422
+  metadata.gz: f57c705d430a28e8d08f394cfb9c371c441a6357211069c5e50db5e1d4d1aa9d6284c924bb454a21f1f1db53c5bec32088931b1e0ea2df8b63071f3ed1a120c5
+  data.tar.gz: 6bc6725d615cdd22c8daa82f8580d6da50d98c2d1b22322209c75a0cc508f067a10a24de7ee2c55e29cc9ece83fd9cece112df3401bb20cfe18e4aa44f0268f4

data/lib/daedalus/dependency_grapher.rb

@@ -25,24 +25,31 @@ class DependencyGrapher
 
   class ExpressionEvaluator
     def initialize(expression)
-      @expression = expression.strip
+      @expression = expression
     end
 
     def evaluate(defines)
+      # Stage0: eliminate comments
+      @expression.gsub!(/(\/\/.*)$/, "")
+      @expression.gsub!(/(\/\*.*\*\/)/, "")
+
       # 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
-      }
+      re = /((!|\s*)?defined((\(|\s+)(\s*[^) ]+)(\)|\s|$)))/o
+      @expression.gsub!(re) do |expr|
+        m = expr.match(re)
+        negate = m[2] == "!"
+        key = m[5].strip
+
+        value = defines.include? key
+        value = !value if negate
+        value ? "true" : "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|
+      @expression.gsub!(/__[A-Za-z0-9_]+__/) do |expr|
         if defines.include?(expr)
           defines[expr].to_s
         elsif integer?(expr)
@@ -50,10 +57,10 @@ class DependencyGrapher
         else
           '0'
         end
-      }
+      end
 
       # this covers other patters.
-      @expression.gsub!(/[A-Z0-9_]{4,}/) { |expr|
+      @expression.gsub!(/[A-Z0-9_]{4,}/) do |expr|
         if defines.include?(expr)
           defines[expr].to_s
         elsif integer?(expr)
@@ -61,7 +68,8 @@ class DependencyGrapher
         else
           '0'
         end
-      }
+      end
+
       # Stage3: Evaluate with ruby eval()
       eval(@expression)
     end

data/lib/daedalus/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daedalus-core
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Brian Shirai