lasp 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09308a13fbaaa0866f4e0f71c3e9bda5b3f68175
-  data.tar.gz: 8dc8898d8ad6b1eef27801d566a8b963ab7186cb
+  metadata.gz: faac6a5058ca029f9afae76c17751e3d59969524
+  data.tar.gz: 92451a7973baef4b40ecaa7b8af4c1ea3b5192aa
 SHA512:
-  metadata.gz: 1df013030f0c92ed76d5cf748d640007b9e11446099d9b68ca0c65ce0247743b8c99013a0efa4fc14db22e795372e87462e746b944ce3cd72406aa02c8549740
-  data.tar.gz: a7725ebe46569683d44f88031665bbbb987d68e462fb459a44b1b64e0c05b3d292f00190df9e7bd95be10768e881a63397f341daa483fdd2bda9fe9d33a6ab92
+  metadata.gz: 65e6433d37ab903dc463d0704ee5864c7c289829f77d0cbdc8dcbe7c9bee6aba3a80013c4a2b6d40c4b183475f00b47d09de3a7167e5f36f4a24c155146ef411
+  data.tar.gz: de567b39199ea999e5331d78686c88237ce8b307b33a944b3308339b9cbaa70a6bfc7e20fa4e0ecf52d2ee31379150266a718e37d33e2e0343eaa5a04626c25f

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Läsp changelog
 
+## v0.10.0 - 2016-02-22
+
+### Added
+
+- Allow escape characters in strings
+    - `\n` - newline
+    - `\t` - tab
+    - `\"` - double quote
+    - `\\` - backslash
+- Allow `print` and `println` to take any number of arguments
+- Add text function to stdlib for easier concatenation (works the same as
+  `print` and `println` now do but returns a string)
+
 ## v0.9.0 - 2016-02-20
 
 ### Added

data/DOCUMENTATION.md

@@ -431,24 +431,18 @@ Returns the inverted truthiness of its argument.
 
 ### print
 
-Prints its argument to stdout and returns `nil`.
+Prints its arguments to stdout and returns `nil`.
 
-```clojure
-(do
-  (print "Hello ")
-  (print "world!")) ; => nil
+See also [println](#println) to print a line of output.
 
+```clojure
+(print "Hello ")
+(print "world!\n") ; Manually add a newline
 ;; Hello world!
-```
-
-
-### println
-
-Prints its argument and a newline to stdout and returns `nil`.
 
-```clojure
-(println "Hello World!") ; => nil
-;; Hello World!
+; It also takes several arguments and prints them after each other:
+(print "Hello " "world!")
+;; Hello world!
 ```
 
 
@@ -777,6 +771,15 @@ Take a list of every Nth item in a list.
 ```
 
 
+### text
+
+Create a string by concatenating all arguments.
+
+```clojure
+(text "one " 1 ", two " 2) ; => "one 1, two 2"
+```
+
+
 ### text->list
 
 Turn a text into a list of its characters.
@@ -855,6 +858,21 @@ Request an answer to a question from a terminal user.
 ```
 
 
+### println
+
+Prints each of its arguments to stdout on a line and returns `nil`.
+
+```clojure
+(println "Hello World!")
+;; Hello World!
+
+(println "Hello " "World!")
+;; Hello World!
+
+(println) ; Prints a newline
+```
+
+
 ### defn
 
 A shorthand macro for defining a function. As a bonus it also wraps

data/lib/lasp/corelib.rb

@@ -20,8 +20,7 @@ module Lasp
     :assoc      => -> (a, key, val)   { a.dup.tap { |a| a[key] = val  }            },
     :dissoc     => -> (a, key)        { a.dup.tap { |a| a.delete(key) }            },
     :not        => -> (arg)           { !arg                                       },
-    :print      => -> (output)        { STDOUT.print(output)                       },
-    :println    => -> (output)        { STDOUT.puts(output)                        },
+    :print      => -> (*output)       { STDOUT.print(*output)                      },
     :readln     => -> ()              { STDIN.gets.chomp                           },
     :apply      => -> (f, list)       { f.call(*list)                              },
     :"."        => -> (obj, m, *args) { obj.send(m, *args)                         },

data/lib/lasp/lexer.rb

@@ -0,0 +1,44 @@
+require "strscan"
+
+class Lexer
+  TOKENS = [
+    /\(|\)/,          # parens
+    /'/,              # quote
+    /"(\\"|[^"])*"/,  # string literal
+    /[^\s)]+/,        # any non-whitespace character excluding )
+  ]
+
+  def self.tokenize(program)
+    new(program).tokenize
+  end
+
+  def initialize(program)
+    @scanner = StringScanner.new(sanitize(program))
+  end
+
+  def tokenize
+    tokens = []
+    while (token = read_token)
+      tokens << token
+    end
+    tokens
+  end
+
+  private
+
+  attr_reader :scanner
+
+  def read_token
+    scanner.skip(/\s+/)
+    return if scanner.eos?
+
+    TOKENS.each do |token|
+      return scanner.scan(token) if scanner.match?(token)
+    end
+  end
+
+  def sanitize(string)
+    # Remove comments
+    string.gsub(/;.*$/, "")
+  end
+end

data/lib/lasp/parser.rb

@@ -1,15 +1,24 @@
+require "lasp/lexer"
+
 module Lasp
   class Parser
+    ESCAPE_CHARACTERS = {
+      '\n'   => "\n",
+      '\t'   => "\t",
+      '\\\\' => "\\",
+      '\"'   => "\"",
+    }
+
     def self.parse(program)
       new.parse(program)
     end
 
     def parse(program)
-      build_ast(tokenize(sanitize(program)))
+      build_ast(tokenize(program))
     end
 
-    def tokenize(string)
-      string.scan(/(?:(?:[^\s"()']|"[^"]*")+|[()'])/)
+    def tokenize(program)
+      Lexer.tokenize(program)
     end
 
     private
@@ -45,14 +54,14 @@ module Lasp
       when "nil"           then nil
       when /\A-?\d+\z/     then Integer(token)
       when /\A-?\d+.\d+\z/ then Float(token)
-      when /"(.*)"/        then String($1)
+      when /"(.*)"/        then String(unescape($1))
       when /:([^\s]+)/     then String($1) # Symbol style strings are actually just strings
       else token.to_sym
       end
     end
 
-    def sanitize(string)
-      string.gsub(/;.*$/, "")
+    def unescape(string)
+      string.gsub(/\\(.)/) { |match| ESCAPE_CHARACTERS.fetch(match, $1) }
     end
   end
 end

data/lib/lasp/repl.rb

@@ -1,5 +1,5 @@
 require "lasp"
-require "lasp/parser"
+require "lasp/lexer"
 require "readline"
 
 module Lasp
@@ -28,7 +28,7 @@ module Lasp
     private
 
     def autoclose_parentheses(input)
-      tokens     = Parser.new.tokenize(input)
+      tokens     = Lexer.tokenize(input)
       num_opens  = tokens.select { |t| t == "(" }.count
       num_closes = tokens.select { |t| t == ")" }.count
 

data/lib/lasp/stdlib.lasp

@@ -154,6 +154,10 @@
 (def ->decimal  (ruby-method :to_f))  ; Convert to decimal
 
 
+; Create a string by concatenating all arguments
+(defn text (& args)
+  (list->text args))
+
 ; Pass a value in order through a list of functions
 (defn pipe (item & fns)
   (if (empty? fns)
@@ -170,3 +174,7 @@
 (defn prompt (question)
   (print question)
   (readln))
+
+; Print with a newline
+(defn println (& args)
+  (print (+ (list->text args) "\n")))

data/lib/lasp/version.rb

@@ -1,3 +1,3 @@
 module Lasp
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lasp
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jimmy Börjesson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,7 @@ files:
 - lib/lasp/ext.rb
 - lib/lasp/fn.rb
 - lib/lasp/interpreter.rb
+- lib/lasp/lexer.rb
 - lib/lasp/macro.rb
 - lib/lasp/params.rb
 - lib/lasp/parser.rb