maroon 0.7.1 → 0.8.0

data/lib/build.rb

@@ -6,9 +6,7 @@ require_relative './Tokens'
 require_relative './ImmutableStack'
 require_relative './ImmutableQueue'
 require_relative './interpretation_context'
-require_relative './Production'
+require_relative './AbstractSyntaxTree'
 require_relative './AstRewritter'
 require_relative './Transformer'
-
-
-
+require_relative './DependencyGraph'

data/lib/maroon/kernel.rb

@@ -2,6 +2,6 @@ require_relative '../Context'
 
 unless Kernel::methods.detect { |m| m== :context }
   def context(*args, &b)
-    Context::define *args, &b
+    Context.define *args, &b
   end
 end

data/lib/maroon/version.rb

@@ -1,3 +1,3 @@
 module Maroon
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maroon
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Rune Funch Søltoft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-22 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sourcify
@@ -58,19 +58,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- Examples/Dijkstra/CalculateShortestDistance.rb
-- Examples/Dijkstra/calculate_shortest_path.rb
-- Examples/Dijkstra/data.rb
-- Examples/Dijkstra/dijkstra.rb
-- Examples/MoneyTransfer.rb
-- Examples/greeter.rb
-- Examples/meter.rb
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - Test/Context_test.rb
-- Test/Greeter_test_disabled.rb
+- Test/Examples/CalculateShortestDistance.rb
+- Test/Examples/MoneyTransfer_test.rb
+- Test/Examples/calculate_shortest_path.rb
+- Test/Examples/data.rb
+- Test/Examples/dijkstra_test.rb
+- Test/Examples/greeter_test.rb
+- Test/Examples/meter_test.rb
 - Test/ImmutableQueue_test.rb
 - Test/abstract_syntax_tree_test.rb
 - Test/alltests.rb
@@ -80,17 +79,20 @@ files:
 - base/AbstractSyntaxTree.rb
 - base/AstRewritter.rb
 - base/ImmutableStack.rb
+- base/dependency_graph.rb
 - base/immutable_queue.rb
 - base/maroon_base.rb
 - base/transfomer.rb
 - generated/Tokens.rb
 - generated/build.rb
 - generated/interpretation_context.rb
+- generated/maroon/kernel.rb
+- lib/AbstractSyntaxTree.rb
 - lib/AstRewritter.rb
 - lib/Context.rb
+- lib/DependencyGraph.rb
 - lib/ImmutableQueue.rb
 - lib/ImmutableStack.rb
-- lib/Production.rb
 - lib/Tokens.rb
 - lib/Transformer.rb
 - lib/build.rb

data/Examples/MoneyTransfer.rb

@@ -1,62 +0,0 @@
-require './lib/maroon.rb'
-
-Context::define :MoneyTransfer do
-  role :source do
-    withdraw do |amount|
-      source.movement(amount)
-      source.log "withdrawal #{amount}"
-    end
-    log do |message|
-      p "#{@source} source #{message}"
-    end
-  end
-
-  role :destination do
-    deposit do |amount|
-      @destination.movement(amount)
-      @destination.log "deposit #{amount}"
-    end
-    logger do |message|
-      p "#{@source} destination #{message}"
-    end
-  end
-
-  role :amount do
-  end
-
-  transfer do
-    source.withdraw -amount
-    destination.deposit amount
-  end
-end
-
-class MoneyTransfer
-  def initialize(source, destination, amount)
-    @source = source
-    @destination = destination
-    @amount = amount
-  end
-end
-class Account
-  def initialize (amount, id)
-    @balance = amount
-    @account_id = id
-  end
-
-  def movement(amount)
-    log "Amount #{amount}"
-    @balance+=amount
-  end
-
-  def log(message)
-    (p s = "instance #{message}")
-  end
-
-  def to_s
-    "balance of #{@account_id}: #{@balance}"
-  end
-end
-
-account = Account.new 1000, "source"
-ctx = MoneyTransfer.new account, account, 100
-ctx.transfer

data/Examples/greeter.rb

@@ -1,46 +0,0 @@
-#Thanks to Ted Milken for updating the original example
-require_relative '../base/maroon_base.rb'
-#require_relative '../base/maroon/kernel.rb'
-#require_relative '../base/maroon/contracts.rb'
-
-class Person
-  attr_accessor :name
-  attr_accessor :greeting
-end
-
-ctx, source = Context::define :Greet_Someone, :greet do
-  role :greeter do
-    welcome do
-      self.greeting
-    end
-  end
-
-  role :greeted do
-  end
-
-  greet do
-    puts %{#{greeter.name}: "#{greeter.welcome}, #{greeted.name}!"}
-  end
-end
-
-class Greet_Someone
-  def initialize(greeter, greeted)
-    @greeter = greeter
-    @greeted = greeted
-  end
-end
-
-p source
-p1 = Person.new
-p1.name = 'Bob'
-p1.greeting = 'Hello'
-
-p2 = Person.new
-p2.name = 'World!'
-p2.greeting = 'Greetings'
-
-#Execute is automagically created for the default interaction (specified by the second argument in context :Greet_Someone, :greet do)
-#Executes construct a context object and calls the default interaction on this object
-#Greet_Someone.assert_that(p1).can_play(:greeter)
-#constructs a Greet_Someone context object and executes greet.
-Greet_Someone.new(p2, p1).greet

data/Test/Greeter_test_disabled.rb

@@ -1,203 +0,0 @@
-require_relative './test_helper.rb'
-
-require_relative '../lib/maroon/kernel.rb'
-require_relative '../lib/build'
-
-require_relative 'assertions.rb'
-#require './Examples/meter.rb'
-
-
-class BasicTests < MiniTest::Unit::TestCase
-  include SourceAssertions
-
-  def test_define_context
-    name = :MyContext
-    ctx, source = Context::define name do
-    end
-    assert_equal(ctx.name, "Kernel::#{name}")
-    assert_equal(source, "class #{name}\r\n\n\n  private\n\n\n\r\nend")
-  end
-
-  def test_base_class
-    name = :MyDerivedContext
-    ctx, source = context name, Person do
-    end
-    obj = MyDerivedContext.new
-    obj.name = name
-    assert_equal(ctx.name, "Kernel::#{name}")
-    refute_nil(obj.name)
-    assert((obj.class < Person), 'Object is not a Person')
-    assert_equal(name, obj.name)
-  end
-
-  def test_define_role
-    name, role_name = :MyContextWithRole, :my_role
-    ctx, source = Context::define name do
-      role role_name do
-        role_go_do do
-
-        end
-      end
-    end
-    refute_nil(ctx)
-    assert_equal(ctx.name, "Kernel::#{name}")
-    assert_source_equal("class #{name}\r\n\n@#{role_name}\n\n  private\ndef #{role_name};@#{role_name} end\n\n  \ndef self_#{role_name}_role_go_do \n end\n\n\r\nend", source)
-  end
-
-  def test_args_on_role_method
-    name, role_name = :MyContextWithRoleAndArgs, :my_role
-    ctx, source = Context::define name do
-      role role_name do
-        role_go_do do |x, y|
-
-        end
-        role_go do |x|
-
-        end
-      end
-    end
-    refute_nil(ctx)
-    assert_equal(ctx.name, "Kernel::#{name}")
-    assert_source_equal("class #{name}\r\n\n@#{role_name}\n\n  private\ndef #{role_name};@#{role_name} end\n\n  \ndef self_#{role_name}_role_go_do(x,y) \n end\n\ndef self_#{role_name}_role_go(x) \n end\n\n\r\nend", source)
-  end
-
-  def test_bind
-    name, other_name = :MyContextUsingBind, :other_role
-    ctx, source = Context::define name do
-      role other_name do
-        plus_one do
-          (self + 1)
-        end
-      end
-      go_do do
-        a = Array.new
-        [1, 2].each do |e|
-          bind e => :other_role
-          a << e.plus_one
-        end
-        a
-      end
-    end
-    arr = MyContextUsingBind.new.go_do
-    refute_nil(ctx)
-    assert_equal(ctx.name, "Kernel::#{name}")
-    expected = "class MyContextUsingBind\r\n  \ndef go_do \na = Array.new\n  [1, 2].each do |e|\n    temp____other_role = @other_role\n    @other_role = e\n    (a << self_other_role_plus_one)\n    @other_role = temp____other_role\n  end\n  a\n end\n\n@other_role\n\n  private\ndef other_role;@other_role end\n\n  \ndef self_other_role_plus_one \n(other_role + 1)  end\n\n\r\nend"
-    assert_source_equal(expected, source)
-    assert_equal(2, arr[0])
-    assert_equal(3, arr[1])
-  end
-end
-
-
-context :Greet_Someone, :greet do
-  role :greeter do
-    welcome do
-      self.greeting
-    end
-  end
-
-  role :greeted do
-  end
-
-  greet do
-    "#{greeter.name}: \"#{greeter.welcome}, #{greeted.name}!\""
-  end
-end
-
-context :Greet_Someone2, :greet do
-  role :greeter do
-    welcome do
-      self.greeting
-    end
-  end
-
-  role :greeted do
-  end
-
-  greet do |msg|
-    a = "#{greeter.name}: \"#{greeter.welcome}, #{greeted.name}!\" #{msg}"
-    p a
-    a
-  end
-end
-
-class Person
-  attr_accessor :name
-  attr_accessor :greeting
-end
-
-
-class Greet_Someone
-  def initialize(greeter, greeted)
-    @greeter = greeter
-    @greeted = greeted
-  end
-end
-
-class Greet_Someone2
-  def initialize(greeter, greeted)
-    @greeter = greeter
-    @greeted = greeted
-  end
-end
-
-class TestExamples < MiniTest::Unit::TestCase
-  def test_greeter
-    p1 = Person.new
-    p1.name = 'Bob'
-    p1.greeting = 'Hello'
-
-    p2 = Person.new
-    p2.name = 'World!'
-    p2.greeting = 'Greetings'
-
-    #Execute is automagically created for the default interaction (specified by the second argument in context :Greet_Someone, :greet do)
-    #Executes constructs a context object and calls the default interaction on this object
-    res1 = Greet_Someone.call p1, p2
-    res2 = Greet_Someone.new(p2, p1).greet
-    res3 = Greet_Someone.new(p2, p1).call
-    assert_equal(res1, "#{p1.name}: \"#{p1.greeting}, #{p2.name}!\"")
-    assert_equal(res1, Greet_Someone.new(p1, p2).greet) #verifies default action
-    #constructs a Greet_Someone context object and executes greet.
-    assert_equal(res2, "#{p2.name}: \"#{p2.greeting}, #{p1.name}!\"")
-    assert_equal(res2, res3)
-  end
-end
-
-
-class TestExamples < MiniTest::Unit::TestCase
-  def test_greeter
-    p1 = Person.new
-    p1.name = 'Bob'
-    p1.greeting = 'Hello'
-
-    p2 = Person.new
-    p2.name = 'World!'
-    p2.greeting = 'Greetings'
-
-    puts "with_contracts: #{Context::with_contracts}"
-    Greet_Someone.assert_that(p1).can_play(:greeter)
-    Greet_Someone.refute_that(self).can_play(:greeter)
-    message = ' Nice weather, don\'t you think?'
-    res1 = Greet_Someone2.call p1, p2, message
-    res2 = Greet_Someone2.new(p2, p1).greet message
-    res3 = Greet_Someone2.new(p2, p1).call message
-    assert_equal(res1, "#{p1.name}: \"#{p1.greeting}, #{p2.name}!\" #{message}")
-    assert_equal(res1, Greet_Someone2.new(p1, p2).greet(message)) #verifies default action
-                                                                  #constructs a Greet_Someone context object and executes greet.
-    assert_equal(res2, "#{p2.name}: \"#{p2.greeting}, #{p1.name}!\" #{message}")
-    assert_equal(res2, res3)
-  end
-end
-
-class TestExamples < MiniTest::Unit::TestCase
-  def test_meter_example
-    meter = Meter.new Time::now, Position.new(1, 2, 0)
-    result = meter.call Position.new(2, 4, 1)
-    assert_equal(3, result.to_i)
-  end
-end
-
-
-
-

data/lib/Production.rb

@@ -1,149 +0,0 @@
-class Production
-  def initialize(ast, interpretation_context)
-    rebind(ImmutableQueue.empty.push(ast), interpretation_context)
-  end
-
-  def type()
-    case
-      when (nil == production) then
-        nil
-      when self_production_is_block_with_bind? then
-        Tokens.block_with_bind
-      when self_production_is_block? then
-        Tokens.block
-      when (production.instance_of?(Fixnum) or production.instance_of?(Symbol)) then
-        Tokens.terminal
-      when self_production_is_rolemethod_call? then
-        Tokens.rolemethod_call
-      when self_production_is_role? then
-        Tokens.role
-      when self_production_is_indexer? then
-        Tokens.indexer
-      when self_production_is_call? then
-        Tokens.call
-      else
-        Tokens.other
-    end
-  end
-
-  def [](i)
-    @production[i]
-  end
-
-  def []=(i, v)
-    @production[i] = v
-  end
-
-  def length()
-    @production.length
-  end
-
-  def last()
-    @production.last
-  end
-
-  def first()
-    @production.first
-  end
-
-  def data()
-    return @data if @data
-    @data = case
-              when self_production_is_call? then
-                @production[2]
-              else
-                @production
-            end
-  end
-
-  def each()
-    yield(self)
-    if production.instance_of?((Sexp or production.instance_of?(Array))) then
-      @queue = @queue.push_array(production)
-    end
-    while @queue.!=(ImmutableQueue.empty) do
-      rebind(@queue, @interpretation_context)
-      yield(self)
-      if production.instance_of?((Sexp or production.instance_of?(Array))) then
-        @queue = @queue.push_array(production)
-      end
-    end
-  end
-
-  private
-  def rebind(queue, ctx)
-    @data = nil
-    @production, @queue = queue.pop
-    @interpretation_context = ctx
-  end
-
-  def self_production_is_role?()
-    case
-      when (self_production_is_call? and interpretation_context.roles.has_key?(production[2])) then
-        @date = [production[2]]
-        return true
-      when (((production == :self) or ((self_production_is_indexer? and ((production[1] == nil) or (production[1] == :self))) or (production and ((production.instance_of?(Sexp) or production.instance_of?(Array)) and (production[0] == :self))))) and @interpretation_context.defining_role) then
-        @data = @interpretation_context.defining_role
-        return true
-      else
-        false
-    end
-  end
-
-  def self_production_is_indexer?()
-    self_production_is_call? and ((production[2] == :[]) or (production[2] == :[]=))
-  end
-
-  def self_production_is_call?()
-    production and ((production.instance_of?(Sexp) or production.instance_of?(Array)) and (production[0] == :call))
-  end
-
-  def self_production_is_block?()
-    production and ((production.instance_of?(Sexp) or production.instance_of?(Array)) and (production[0] == :iter))
-  end
-
-  def self_production_is_block_with_bind?()
-    if self_production_is_block? then
-      body = @production.last
-      if body and exp = body[1] then
-        bind = Production.new(exp, @interpretation_context)
-        if (bind.type == Tokens.call) and (bind.data == :bind) then
-          aliases = {}
-          list = exp.last[(1..-1)]
-          (list.length / 2).times do |i|
-            local = list[(i * 2)].last
-            role_name = list[((i * 2) + 1)].last
-            raise("Local in bind should be a symbol") unless local.instance_of?(Symbol)
-            unless role_name.instance_of?(Symbol) then
-              raise("Role name in bind should be a symbol")
-            end
-            aliases[local] = role_name
-          end
-          @data = aliases
-          true
-        end
-      end
-    end
-  end
-
-  def self_production_is_rolemethod_call?()
-    can_be = self_production_is_call?
-    if can_be then
-      instance = Production.new(production[1], @interpretation_context)
-      can_be = (instance.type == Tokens.role)
-      if can_be then
-        instance_data = instance.data
-        role = @interpretation_context.roles[instance_data]
-        data = production[2]
-        can_be = role.has_key?(data)
-        @data = [data, instance_data]
-      end
-    end
-    can_be
-  end
-
-  attr_reader :interpretation_context
-  attr_reader :queue
-  attr_reader :production
-
-end