bakkdoor-blocktalk 0.1.5 → 0.1.6

data/README.markdown

@@ -1,5 +1,5 @@
 # ***Blocktalk*** #
-### **v0.1.5** ###
+### **v0.1.6** ###
 
 ## **Blocktalk** is a dynamic, object-oriented programming language somewhat in the tradition of Smalltalk and Ruby. ##
 

data/TODO

@@ -1,7 +1,8 @@
 ##################
-# TODO for v0.1: #
+# TODO for v0.2: #
 ##################
 
+- some nicer support for ruby getter & setter methods
 - add optimizations, when possible
 - add more documentation & enhance standard library (as much as possible in Blocktalk itself)
 

data/examples/classes_modules.bt

@@ -66,3 +66,52 @@ Console puts: (chris distance_to: city)
 chris method_a
 chris method_b
 chris method_c: "hey" and: "ho" plus: "cool!"
+
+
+# nested modules need to be introduces like this
+Module >> :F do
+  Module >> :G do
+    Module >> :H do
+      def self bar = do
+        Console puts: "Nested modules: In F::G::H#bar"
+      end
+    end
+  end
+end
+
+F::G::H bar
+
+
+#extend an existing module
+Module >> :F do
+  def self blubb = do
+    Console puts: "In F#blubb"
+  end
+end
+
+F blubb
+
+F::G::H bar # this still works!
+
+Module >> :C do
+  Module >> :D do
+    Module >> :E do
+      Module >> :F do
+        def self foo = do
+          Console puts: "In C::D::E::F#foo"
+        end
+        Class >> :G do
+          def bar = do
+            Console puts: "In instance method: C::D::E::F::G#bar"
+          end
+        end
+      end
+    end
+  end
+end
+
+C::D::E::F foo
+
+g = C::D::E::F::G new
+g bar
+Console puts: (g class)

data/examples/webserver.bt

@@ -6,8 +6,13 @@ System require: "socket"
 require: "lib/blocktalk"
 
 Class >> :Logger do
-  def initialize = do |logfile|
-    @log_file = logfile
+  def logfile = do |logfile|
+    # this makes sure, we return self at the end for easy methodchaining like in smalltalk
+    # e.g.:
+    # log = Logger new logfile: file
+    self chainable {
+      @log_file = logfile
+    }
   end
 
   def log = do |message|
@@ -80,7 +85,7 @@ Class >> :Webserver do
         Console puts: "OOPS: #{ex inspect}"
       end
 
-    ensure{
+      ensure{
         (src nil?) if_false {
           src close
         }
@@ -125,9 +130,9 @@ File open: logfile_name mode: "w+" do |logfile|
   {port = ARGV at: 0} if: (ARGV at: 0)
 
   server = TCPServer new: 'localhost' port: port
-  logger = Logger new: logfile
+  logger = Logger new logfile: logfile
 
-  Kernel loop do
+  System loop do
     session = server accept
     request = session gets
     logStr =  "#{session peeraddr at: 2} (#{session peeraddr at: 3})\n"

data/grammar/blocktalk.rb

@@ -4281,11 +4281,29 @@ module Blocktalk
       if r5
         s11, i11 = [], index
         loop do
+          i12 = index
           if input.index(Regexp.new('[a-zA-Z0-9_]'), index) == index
-            r12 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
-            r12 = nil
+            r13 = nil
+          end
+          if r13
+            r12 = r13
+          else
+            if input.index('::', index) == index
+              r14 = instantiate_node(SyntaxNode,input, index...(index + 2))
+              @index += 2
+            else
+              terminal_parse_failure('::')
+              r14 = nil
+            end
+            if r14
+              r12 = r14
+            else
+              self.index = i12
+              r12 = nil
+            end
           end
           if r12
             s11 << r12

data/grammar/blocktalk.tt

@@ -396,7 +396,7 @@ grammar Blocktalk do
   # names - basically anything, that you can store something in or
   # assign to.
   rule identifier do
-    ('@' / '@@')? ([a-zA-Z]+ / '$' [0-9]) [a-zA-Z0-9_]* <IdentifierNode>
+    ('@' / '@@')? ([a-zA-Z]+ / '$' [0-9]) ([a-zA-Z0-9_] / '::')* <IdentifierNode>
   end
 
   # possible names for messages / methods

data/lib/kernel/class.rb

@@ -6,11 +6,12 @@ class Class
   def self.in__subclassing(class_name_sym, superclass = Object, &block)
     # try to find class via const_get
     # if error occurs (not found), define a new class with the given name
+    current_module = Module.current
     begin
-      classobj = Kernel::const_get(class_name_sym)
+      classobj = current_module.const_get(class_name_sym)
       classobj.class_eval(&block)
     rescue
-      Kernel::const_set(class_name_sym, Class.new(superclass, &block))
+      current_module.const_set(class_name_sym, Class.new(superclass, &block))
     end
   end
 
@@ -37,10 +38,4 @@ class Class
       end
     end
   end
-
-  def meta_class
-    class << self
-      self
-    end
-  end
 end

data/lib/kernel/module.rb

@@ -1,11 +1,25 @@
 class Module
+  @@mod_stack = []
   def self.in(module_name_sym, &block)
-    if Kernel::constants.include?(module_name_sym.to_s)
-      moduleobj = Kernel::const_get(module_name_sym)
-      moduleobj.module_eval(&block)
-    else
-      Kernel::const_set(module_name_sym, Module.new(&block))
-    end
+    parent_mod = (["Kernel"] + @@mod_stack).join('::')
+
+    str = <<-REND
+        unless #{parent_mod}.const_defined?('#{module_name_sym}')
+          #{parent_mod}.module_eval '#{module_name_sym} = Module.new'
+        end
+    REND
+    Kernel.module_eval str
+
+    @@mod_stack.push module_name_sym
+
+    mod = Kernel.module_eval("#{@@mod_stack.join('::')}")
+    mod.module_eval(&block)
+
+    @@mod_stack.pop
+  end
+
+  def self.current
+    Kernel.eval((["Kernel"] + @@mod_stack).join("::"))
   end
 
   def self.>>(module_name_sym, &block)

data/lib/kernel/object.rb

@@ -71,4 +71,16 @@ class Object
       raise "Unknown method, don't know what to do: #{self.class}##{name}"
      end
   end
+
+  def chainable(&block)
+    block.call
+    self
+  end
+
+
+  def meta_class
+    class << self
+      self
+    end
+  end
 end

data/lib/kernel/system.rb

@@ -1,5 +1 @@
-class System
-  def self.require(file)
-    Kernel::require(file)
-  end
-end
+System = Kernel

data/parser/nodes/class_method_definition.rb

@@ -8,7 +8,7 @@ module Blocktalk
         "self.meta_class.class_eval{define_method(:#{method_name_with_params}, &#{method_body.value})}"
       else
         # no parameters given -> simply call define_method with a param-less block
-        "self.meta_class.class_eval{define_method(\"#{method_name.value}\", &#{method_body.body.value})}"
+        "self.meta_class.class_eval{define_method(\"#{method_name.value}\"){#{method_body.body.value}}}"
       end
     end
   end

data/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bakkdoor-blocktalk
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Christopher Bertels
@@ -36,6 +36,7 @@ files:
 - TODO
 - LICENSE
 - evaluator.rb
+- version.rb
 - grammar/blocktalk.tt
 - grammar/blocktalk.rb
 - lib/core.rb