Accept symbol for require, pinclude (close #49)

lib/lyp/etc/lyp.ly

@@ -117,6 +117,7 @@
       (ly:parser-include-string parser str)))
 
   (define (lyp:include parser location path once)  (let* (
+      (path (if (symbol? path) (symbol->string path) path))
       (current-dir  (lyp:this-dir))
       (abs-path     (if (lyp:absolute-path? path)
                         path
@@ -146,7 +147,8 @@
 )
 
 % command form
-require = #(define-void-function (parser location ref)(string?) (let* (
+require = #(define-void-function (parser location ref)(string-or-symbol?) (let* (
+    (ref (if (symbol? ref) (symbol->string ref) ref))
     (name (lyp:ref->name ref))
     (package-dir (lyp:name->dir name))
     (entry-point-path (lyp:join-path package-dir "package.ly"))
@@ -160,14 +162,14 @@ require = #(define-void-function (parser location ref)(string?) (let* (
   ))
 ))
 
-pinclude = #(define-void-function (parser location path)(string?)
+pinclude = #(define-void-function (parser location path)(string-or-symbol?)
   (lyp:include parser location path #f))
 
-pcondInclude = #(define-void-function (parser location expr path)(scheme? string?)
+pcondInclude = #(define-void-function (parser location expr path)(scheme? string-or-symbol?)
   (if expr (lyp:include parser location path #f)))
 
-pincludeOnce = #(define-void-function (parser location path)(string?)
+pincludeOnce = #(define-void-function (parser location path)(string-or-symbol?)
   (lyp:include parser location path #t))
 
-pcondIncludeOnce = #(define-void-function (parser location expr path)(scheme? string?) 
+pcondIncludeOnce = #(define-void-function (parser location expr path)(scheme? string-or-symbol?) 
   (if expr (lyp:include parser location path #t)))

lib/lyp/resolver.rb

@@ -120,7 +120,7 @@ def resolve_tree
       end
     end
 
-    DEP_RE = /\\(require|include|pinclude|pincludeOnce) "([^"]+)"/.freeze
+    DEP_RE = /\\(require|include|pinclude|pincludeOnce)\s+(?:"|#')?([^\s"]+)"?/.freeze
     INCLUDE = "include".freeze
     PINCLUDE = "pinclude".freeze
     PINCLUDE_ONCE = "pincludeOnce".freeze

spec/resolver_spec.rb

@@ -163,6 +163,14 @@ def resolver(tree = Lyp::DependencyLeaf.new, opts = {})
     end
   end
 
+  it "supports require with symbol instead of string" do
+    with_packages(:simple) do
+      resolver = resolver('spec/user_files/simple_symbol.ly')
+      o = resolver.compile_dependency_tree
+      expect(o.dependencies.keys).to eq(%w{a c})
+    end
+  end
+
   it "correctly resolves a circular dependency" do
     with_packages(:circular) do
       r = resolver('spec/user_files/circular.ly').resolve_package_dependencies
@@ -274,14 +282,6 @@ def resolver(tree = Lyp::DependencyLeaf.new, opts = {})
         "#{$packages_dir}/b@abc"
       )
 
-      r = resolver('spec/user_files/b.ly').resolve_package_dependencies
-
-      expect(r[:definite_versions]).to eq(%w{b@def c@0.3.0})
-      expect(r[:package_refs]).to eq({"b" => "b", "c" => "c"})
-      expect(r[:package_dirs]['b']).to eq(
-        "#{$packages_dir}/b@def"
-      )
-
       r = resolver('spec/user_files/b_def.ly').resolve_package_dependencies
 
       expect(r[:definite_versions]).to eq(%w{b@def c@0.3.0})

spec/user_files/simple_symbol.ly

@@ -0,0 +1,3 @@
+\require a
+#(ly:message "simple\n")
+\require #'c

spec/user_files/the-works-symbols.ly

@@ -0,0 +1,3 @@
+\require dummy
+
+\require #'dummy