bakkdoor-blocktalk 0.1.4 → 0.1.5

data/README.markdown

@@ -1,5 +1,5 @@
 # ***Blocktalk*** #
-### **v0.1.4** ###
+### **v0.1.5** ###
 
 ## **Blocktalk** is a dynamic, object-oriented programming language somewhat in the tradition of Smalltalk and Ruby. ##
 
@@ -15,8 +15,8 @@ For example, defining classes and modules in Blocktalk is also done via methodca
 respectively:
 
     Class >> :Foo do
-	def bar = do |baz|
-	    Console puts: "In Foo#bar with baz = #{baz}"
+	    def bar = do |baz|
+	      Console puts: "In Foo#bar with baz = #{baz}"
     	end
     end
 
@@ -41,9 +41,9 @@ can take two explicit codeblocks for a if and then part, or just a block for the
 or implicitly as a ruby-like method call with a passed in block):
 
     (a < b) if_true: {
-	Console print: "a smaller than b!"
+	    Console print: "a smaller than b!"
     } if_false: {
-	Console print: "a greater than b!"
+	    Console print: "a greater than b!"
     }
 
 Since Blocktalk supports a very easy literal syntax for codeblocks, many special keywords aren't needed (as in Smalltalk).
@@ -53,8 +53,8 @@ Another example would be a while loop:
 
     i = Console gets: "Please enter a number!" to_i
     {i < 10} while_true {
-	Console print: "a smaller than b!"
-	i = Console gets: "Enter again!" to_i
+	    Console print: "a smaller than b!"
+	    i = Console gets: "Enter again!" to_i
     }
 
 In this case, while_true takes a ruby-like implicit block, noticeable by the absence of the colon after the methodname,
@@ -68,15 +68,15 @@ Exception handling in Blocktalk is done similar to most programming languages, i
 
     i = Console gets: "Please enter a number!"
     try {
-	Console print: "10 / i = #{(10 / (i to_i))}"
+	    Console print: "10 / i = #{(10 / (i to_i))}"
    
-	catch: ZeroDivisionError do |ex|
-	    Console print: "got a exception: #{ex message}"
-	end
+	    catch: ZeroDivisionError do |ex|
+	      Console print: "got a exception: #{ex message}"
+	    end
 
-	ensure {
-	    Console print: "this will get done, no matter what value i has!"
-	}
+	    ensure {
+	      Console print: "this will get done, no matter what value i has!"
+	    }
     }
 
 This example will obviously fail if the we enter a zero. As in Ruby, the ensure-block gets run independent of an error

data/examples/conditionals.bt

@@ -0,0 +1,37 @@
+x = 10
+y = 0
+
+{
+  y = Console gets: "please enter a positive number:" to_i
+} until {y > 0}
+
+
+x <= y if_true: {
+  Console puts: "x (#{x}) <= y (#{y})!"
+} if_false: {
+  Console puts: "x (#{x}) > y (#{y})!"
+}
+
+Console puts
+
+# blocktalk also supports the if / unless at the end, as in ruby
+{ Console puts: "x (#{x}) <= y (#{y})!" } if: (x <= y)
+{ Console puts: "x (#{x}) > y (#{y})!"} if: (x > y)
+
+Console puts
+
+# this would also work:
+{ Console puts: "x (#{x}) > y (#{y})!" } unless: (x <= y)
+
+Console puts
+
+x = 0
+{x < 10} while_true {
+  Console puts: x
+  x = x + 1
+}
+
+{x < 0} while_false {
+  Console puts: x
+  x = x - 1
+}

data/examples/literals.bt

@@ -0,0 +1,8 @@
+# some literals
+
+int = 5
+float = 5.32
+#char = ?A # still not working :(
+string = "hello"
+arr = [1,2,3]
+hash = {:a => "b", :c => "d"}

data/examples/webserver.bt

@@ -0,0 +1,145 @@
+# small working webserver example
+# taken, translated & changed a bit from:
+# http://blogs.msdn.com/abhinaba/archive/2005/10/14/ruby-webserver-in-70-lines-of-code.aspx
+
+System require: "socket"
+require: "lib/blocktalk"
+
+Class >> :Logger do
+  def initialize = do |logfile|
+    @log_file = logfile
+  end
+
+  def log = do |message|
+    Console puts: "\n\n";
+            puts: ("=" * 50);
+            puts: "\n #{message}"
+
+    (@log_file == nil) if_false {
+      @log_file puts: "\n\n";
+                puts: ("=" * 50);
+                puts: "\n #{message}"
+    }
+  end
+end
+
+Class >> :Webserver do
+  def initialize = do |session request: req root_path: root_path|
+    @session = session
+    @request = req
+    @root_path = root_path
+  end
+
+  def full_path = do
+    filename = nil
+    (@request =~ /GET (.*) HTTP.*/) if {
+      filename = $1
+    }
+
+    (filename == nil) unless {
+      filename = @root_path + filename
+      filename = File expand_path: filename with: @default_path
+    }
+
+    (File directory?: filename) if {
+      filename << '/index.html'
+    }
+
+    return filename
+  end
+
+  def serve = do
+    Console puts: "trying to serve content"
+    @full_path = self full_path
+    src = nil
+    try{
+      ((File exist?: @full_path) and: (File file?: @full_path)) if_true: {
+        Console puts: "File exists: #{@full_path}"
+        # path should start with base path
+        ((@full_path index: @root_path) == 0) if_true: {
+          content_type = self content_type: @full_path
+          @session print: "HTTP/1.1 200/OK\r\nServer: Blocktalk-HTTP\r\nContent-type: #{content_type}\r\n\r\n"
+          src = File open: @full_path mode: "rb"
+
+          {src eof?} while_false {
+            buffer = src read: 256
+            @session write: buffer
+          }
+          src close
+          src = nil
+        } if_false: {
+          # should have sent a 403 Forbidden access but then the attacker knows that such a file exists
+          @session print: "HTTP/1.1 404/Object Not Found\r\nServer: Blocktalk-HTTP\r\n\r\n"
+        }
+      } if_false: {
+        Console puts: "Error: File doesnt exist: #{@full_path}"
+        @session print: "HTTP/1.1 404/Object Not Found\r\nServer: Blocktalk-HTTP\r\n\r\n"
+      }
+
+      catch: StandardError do |ex|
+        Console puts: "OOPS: #{ex inspect}"
+      end
+
+    ensure{
+        (src nil?) if_false {
+          src close
+        }
+        @session close
+      }
+    }
+  end
+
+  def content_types = do
+    {
+      ".html" => "text/html",
+      ".htm" => "text/html",
+      ".txt" => "text/plain",
+      ".css" => "text/css",
+      ".jpeg" => "image/jpeg",
+      ".jpg" => "image/jpeg",
+      ".gif" => "image/gif",
+      ".bmp" => "image/bmp",
+      ".rb" => "text/plain",
+      ".xml" => "text/xml",
+      ".xsl" => "text/xml"
+    }
+  end
+
+  def content_type = do |path|
+    ext = File extname: path
+    type = self content_types at: ext
+
+    (type nil?) if_true {
+      type = "text/html"
+    }
+
+    return type
+  end
+end
+
+root_path = "/home/bakkdoor/projekte/blocktalk/webserver/httpd/"
+logfile_name = root_path + "/log.txt"
+
+File open: logfile_name mode: "w+" do |logfile|
+  port = 3000
+  {port = ARGV at: 0} if: (ARGV at: 0)
+
+  server = TCPServer new: 'localhost' port: port
+  logger = Logger new: logfile
+
+  Kernel loop do
+    session = server accept
+    request = session gets
+    logStr =  "#{session peeraddr at: 2} (#{session peeraddr at: 3})\n"
+    logStr = logStr + (Time now localtime strftime: "%Y/%m/%d %H:%M:%S")
+    logStr = logStr + "\n#{request}"
+    logger log: logStr
+
+    Console puts: "OK"
+
+    Thread start: session with: request do |session request|
+      ws = Webserver new: session request: request root_path: root_path
+      ws serve
+    end
+  end
+end

data/grammar/blocktalk.rb

@@ -3015,6 +3015,7 @@ module Blocktalk
     def pair
       elements[2]
     end
+
   end
 
   module HashLiteral1
@@ -3037,7 +3038,7 @@ module Blocktalk
         first_pair = first_entry.value
         hash_str += "#{first_pair[0]} => #{first_pair[1]},"
         rest_pairs.elements.each do |ws_and_pair|
-          pair = ws_and_pair.pair
+          pair = ws_and_pair.pair.value
           hash_str += "#{pair[0]} => #{pair[1]},"
         end
         hash_str += "}"
@@ -3123,6 +3124,19 @@ module Blocktalk
                 if r11
                   r13 = _nt_hash_entry
                   s9 << r13
+                  if r13
+                    s14, i14 = [], index
+                    loop do
+                      r15 = _nt_ws
+                      if r15
+                        s14 << r15
+                      else
+                        break
+                      end
+                    end
+                    r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
+                    s9 << r14
+                  end
                 end
               end
               if s9.last
@@ -3141,26 +3155,26 @@ module Blocktalk
             r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
             s0 << r8
             if r8
-              s14, i14 = [], index
+              s16, i16 = [], index
               loop do
-                r15 = _nt_ws
-                if r15
-                  s14 << r15
+                r17 = _nt_ws
+                if r17
+                  s16 << r17
                 else
                   break
                 end
               end
-              r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
-              s0 << r14
-              if r14
+              r16 = instantiate_node(SyntaxNode,input, i16...index, s16)
+              s0 << r16
+              if r16
                 if input.index('}', index) == index
-                  r16 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                  r18 = instantiate_node(SyntaxNode,input, index...(index + 1))
                   @index += 1
                 else
                   terminal_parse_failure('}')
-                  r16 = nil
+                  r18 = nil
                 end
-                s0 << r16
+                s0 << r18
               end
             end
           end

data/grammar/blocktalk.tt

@@ -270,7 +270,7 @@ grammar Blocktalk do
 
   rule hash_literal do
     # '{' ws* '}' /
-    '{' ws* first_entry:(hash_entry)? ws* rest_pairs:(',' ws* pair:(hash_entry))*  ws* '}' {
+    '{' ws* first_entry:(hash_entry)? ws* rest_pairs:(',' ws* pair:(hash_entry) ws*)*  ws* '}' {
       def value
         if self.text_value =~ /\{\s*\}/
           return "{}"
@@ -279,7 +279,7 @@ grammar Blocktalk do
           first_pair = first_entry.value
           hash_str += "#{first_pair[0]} => #{first_pair[1]},"
           rest_pairs.elements.each do |ws_and_pair|
-            pair = ws_and_pair.pair
+            pair = ws_and_pair.pair.value
             hash_str += "#{pair[0]} => #{pair[1]},"
           end
           hash_str += "}"

data/lib/blocktalk.bt

@@ -1,3 +1,5 @@
 # blocktalk standard library files
 
 require: "blocktalk/array"
+require: "blocktalk/hash"
+require: "blocktalk/string"

data/lib/blocktalk/hash.bt

@@ -0,0 +1,13 @@
+Class >> :Hash do
+  def at = do |key|
+    %ruby{
+      self[key]
+    }%
+  end
+
+  def at = do |key put: value|
+    %ruby{
+      self[key] = value
+    }%
+  end
+end

data/lib/kernel/codeblock.rb

@@ -50,8 +50,22 @@ module Kernel
       end
     end
 
-    def until(&block)
-      self.while_false(&block)
+    def until(&condition_block)
+      while not condition_block.call
+        self.call
+      end
+    end
+
+    def if(condition)
+      if condition
+        self.call
+      end
+    end
+
+    def unless(condition)
+      unless condition
+        self.call
+      end
     end
   end
 end

data/parser/nodes/string.rb

@@ -1,7 +1,7 @@
 module Blocktalk
   class StringLiteralNode < Treetop::Runtime::SyntaxNode
     def value
-      "\"" + self.string_val.elements.collect{|e| e.value}.join("") + "\""
+      "\"" + self.string_val.elements.collect{|e| e.value}.join("").gsub('"', '\"').gsub("'", "\'") + "\""
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bakkdoor-blocktalk
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Christopher Bertels
@@ -36,7 +36,6 @@ files:
 - TODO
 - LICENSE
 - evaluator.rb
-- version.rb
 - grammar/blocktalk.tt
 - grammar/blocktalk.rb
 - lib/core.rb
@@ -51,21 +50,25 @@ files:
 - lib/kernel/system.rb
 - lib/kernel/object.rb
 - lib/blocktalk
+- lib/blocktalk/hash.bt
 - lib/blocktalk/string.bt
 - lib/blocktalk/array.bt
 - lib/blocktalk.bt
 - bin/blocktalk
+- examples/webserver.bt
 - examples/test3.bt
 - examples/fac.bt
 - examples/chained_method_call.bt
 - examples/exceptions.bt
 - examples/string_interpol.bt
 - examples/test2.bt
+- examples/literals.bt
 - examples/ruby_methods.bt
 - examples/multiple_methodcall.bt
 - examples/linecounter.bt
 - examples/require.bt
 - examples/portscan.bt
+- examples/conditionals.bt
 - examples/classes_modules.bt
 - examples/test.bt
 - examples/string_test.bt

data/version.rb

@@ -1,3 +0,0 @@
-def blocktalk_version
-  return "0.1.3"
-end