ppr 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3c2c8adf60e11d57a5c5bd231828482b93e9da72
-  data.tar.gz: b2a411642ca9e8f9de4aa225779082cd5d0d1324
+SHA256:
+  metadata.gz: 48e44434cdd2a83270beb33c69d7d1141cc3333857505910f16cb2baa9fcdbae
+  data.tar.gz: f3a4d37780596606a2a1957c28a099dac51eef57330ad02f499ad7291821ee61
 SHA512:
-  metadata.gz: 32baf77bd2913db328a208c6666bc415d752df5f498b77be528e80cb8403b84a788890f4dc1f7087362832b93a12e558b10a23c759670093152d45f6e70e8364
-  data.tar.gz: 47bbe12fae200d8152034b76ff247aa7ccee4254f2b7a9e9ef397d29541eb4c8f3a65e36a1416e974801da4107413e7a84463da328cbf0c34cde4d0fcd4968c4
+  metadata.gz: 77bc95d237a38e2979a861ab617b6a86ca31dc1008f85fc54ad82f15cc7f6dbcd1303d88993bb020aca05793eda2377a1ee1f713b19fb0412f670dfe24a83688
+  data.tar.gz: 04a6ba69898af70b296f1199e9106c3e984b6d8f8df9c81e4cb3d93f96ff77b8b031b14440bef6450eaae2092f8493bcbd7161cd17bce0189ef0a5f5e878da66

data/lib/ppr/ppr_core.rb

@@ -4,6 +4,7 @@
 
 require "ppr/safer_generator.rb"
 require "ppr/keyword_searcher.rb"
+require 'delegate'
 
 module Ppr
 
@@ -302,11 +303,26 @@ class LoadRequire < Macro
         super("",num,ppr,expand: expand)
     end
 
+    def set_locations(locations)
+        @locations = locations
+    end
+
+    def find_file(name)
+        @locations.each do |i|
+          filepath =  i + "/" + name
+          if File.exist?(filepath)
+            return filepath
+          end
+        end
+
+        raise "File #{name} was not found in includes."
+    end
+
     # Loads and preprocess file +name+.
     def loadm(name)
         output = StringIO.new("")
         # print "name=#{name}\n"
-        File.open(name,"r") do |input|
+        File.open(find_file(name),"r") do |input|
             @ppr.preprocess(input,output)
         end
         return output.string
@@ -392,7 +408,8 @@ class Preprocessor
                    endm: ".end",
                    expand: ":<",
                    separator: /^|[^\w]|$/, glue: "##",
-                   escape: "\\")
+                   escape: "\\",
+                   includes: Dir.pwd)
         # Check and Initialize the keywords
         # NOTE: since there are a lot of checks, use a generic but
         # harder to read code.
@@ -453,6 +470,10 @@ class Preprocessor
         params.each do |k,v|
             parameter_set(k,v)
         end
+
+        #include folder locations to search for load and require
+        @includes = []
+        (@includes << includes).flatten!
     end
 
     # Methods for handling the execution context of the macros.
@@ -531,17 +552,17 @@ class Preprocessor
 
     # Tells if a line corresponds to an end keyword.
     def is_endm?(line)
-        @endm.match(line)
+        @endm.match(line.strip)
     end
 
     # Tells if a line corresponds to an else keyword.
     def is_elsem?(line)
-        @elsem.match(line)
+        @elsem.match(line.strip)
     end
 
     # Tells if a line corresponds to an endif keyword.
     def is_endifm?(line)
-        @endifm.match(line)
+        @endifm.match(line.strip)
     end
 
     # Extract a macro definition from a +line+ if there is one.
@@ -606,8 +627,10 @@ class Preprocessor
             macro = Assign.new(name,@number,self,expand: @expand)
         when @loadm then
             macro = Load.new(@number,self,expand: @expand)
+            macro.set_locations(@includes)
         when @requirem then
             macro = Require.new(@number,self,expand: @expand)
+            macro.set_locations(@includes)
         when @ifm then
             macro = If.new(@number,self,expand: @expand)
         else

data/lib/ppr/test_ppr.rb

@@ -149,7 +149,7 @@ $success &= test_preprocessor_exception($ppr,
 print "... Undefined symbol in macro code... "
 $success &= test_preprocessor_exception($ppr, 
                         "\n.def HE(name)\n :< foobar \n.end\nHE(Foo)",
-                        "HE:5):2: undefined local variable or method")
+                        "HE:5):3: undefined local variable or method")
 
 
 # puts "\nBuilding a preprocessor with an invalid escape character."

data/lib/ppr/version.rb

@@ -1,3 +1,3 @@
 module Ppr
-  VERSION = "0.0.4"
+  VERSION = "0.0.7"
 end

data/ppr.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", ">= 12.3.3"
+  spec.add_development_dependency "minitest", ">= 12.3.3"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ppr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Lovic Gauthier
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2022-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 12.3.3
 description: |-
   Preprocessor in Ruby: provides a Ruby class named Rpp which implements a text preprocessor where macros are specified in Ruby language.
    Usage:
@@ -90,7 +90,7 @@ homepage: https://github.com/civol
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: 'Preprocessor in Ruby: text preprocessor where macros are specified in Ruby
   language.'