moar moar moar

pgbovine · pgbovine · commit 516b4f4fd533 · 2015-07-12T20:51:46.000Z
diff --git a/v3/bottle_server.py b/v3/bottle_server.py
@@ -104,4 +104,5 @@ def submit_matrix_problem():
 
 
 if __name__ == "__main__":
-    run(host='localhost', port=8080, reloader=True)
+    #run(host='localhost', port=8080, reloader=True)
+    run(host='0.0.0.0', port=8003, reloader=True) # make it externally visible - DANGER this is very insecure since there's no sandboxing!
diff --git a/v4-cokapi/backends/ruby/notes.txt b/v4-cokapi/backends/ruby/notes.txt
@@ -106,3 +106,9 @@ gem install binding_of_caller
 Also see here for inspirational example code for getting a pretty backtrace:
 https://github.com/ko1/pretty_backtrace/blob/master/lib/pretty_backtrace.rb
 
+
+---
+2015-07-11
+
+http://eli.thegreenplace.net/2006/04/18/understanding-ruby-blocks-procs-and-methods/
+
diff --git a/v4-cokapi/backends/ruby/pg_logger.rb b/v4-cokapi/backends/ruby/pg_logger.rb
@@ -13,8 +13,6 @@
 # - display class and instance variables
 # - display the 'binding' within a proc/lambda object, which represents
 #   its closure
-# - for simplicity, maybe consolidate the '<main>' frame into the global
-#   frame, so that 'locals' defined in main and methods appear together
 # - support gets() for user input using the restart hack mechanism
 #   - user input stored in $_
 # - support 'include'-ing a module and bringing in variables into namespace
@@ -203,6 +201,8 @@ def self.iseq_local_variables iseq
       stack_entry = {}
       stack_entry['is_highlighted'] = false # set the last entry to true later
 
+      is_main = false
+
       iseq = dc.frame_iseq(i)
       if !iseq
         # if you're, say, in a built-in operator like :/ (division)
@@ -225,7 +225,12 @@ def self.iseq_local_variables iseq
         STDERR.print 'frame_description: '
         STDERR.puts boc.frame_description
         STDERR.print 'frame_type: '
-        STDERR.puts boc.frame_type # 'eval', 'method', 'block'
+        STDERR.puts boc.frame_type # :eval, :method, :block
+
+        # special-case handling for the toplevel '<main>' frame
+        if boc.frame_description == '<main>' && boc.frame_type == :eval
+          is_main = true
+        end
 
         stack_entry['func_name'] = boc.frame_description # TODO: integrate 'frame_type' too?
 
@@ -252,13 +257,26 @@ def self.iseq_local_variables iseq
 
         stack_entry['ordered_varnames'] = lvs.map { |e| e.to_s }
         stack_entry['encoded_locals'] = lvs_val
-      end
 
-      stack << stack_entry # only append on success
+        # just fold everything into globals rather than creating a
+        # separate (redundant) frame for '<main>'
+        if is_main
+          entry['ordered_globals'] += stack_entry['ordered_varnames']
+          entry['globals'].update(stack_entry['encoded_locals'])
+        end
+      end
 
+      STDERR.puts '--- is_main: %s' % is_main
       STDERR.print '>>> ', loc, ' ', lvs, lvs_val
       STDERR.puts
       STDERR.puts
+
+      # no separate frame for main since its local variables were folded
+      # into globals
+      if !is_main
+        stack << stack_entry
+      end
+
     end
   end
 
diff --git a/v4-cokapi/backends/ruby/tests/class-method.rb b/v4-cokapi/backends/ruby/tests/class-method.rb
@@ -0,0 +1,7 @@
+# from https://en.wikibooks.org/wiki/Ruby_Programming/Syntax/Classes
+class MyClass
+  def self.some_method
+    puts 'something'
+  end
+end
+MyClass.some_method
diff --git a/v4-cokapi/backends/ruby/tests/class-variables.rb b/v4-cokapi/backends/ruby/tests/class-variables.rb
@@ -0,0 +1,18 @@
+# from https://en.wikibooks.org/wiki/Ruby_Programming/Syntax/Classes
+
+class MyClass
+  @@value = 1
+  def add_one
+    @@value= @@value + 1
+  end
+  
+  def value
+    @@value
+  end
+end
+instanceOne = MyClass.new
+instanceTwo = MyClass.new
+puts instanceOne.value
+instanceOne.add_one
+puts instanceOne.value
+puts instanceTwo.value
diff --git a/v4-cokapi/backends/ruby/tests/proc-return.rb b/v4-cokapi/backends/ruby/tests/proc-return.rb
@@ -0,0 +1,11 @@
+# adapted from http://eli.thegreenplace.net/2006/04/18/understanding-ruby-blocks-procs-and-methods/
+
+def gen_times(factor)
+    return Proc.new {|n| n*factor }
+end
+
+times3 = gen_times(3)
+times5 = gen_times(5)
+
+puts times3.call(12)               #=> 36
+puts times5.call(5)                #=> 25
diff --git a/v4-cokapi/backends/ruby/tests/toplevel-inst-class-vars.rb b/v4-cokapi/backends/ruby/tests/toplevel-inst-class-vars.rb
@@ -0,0 +1,10 @@
+@x = 42
+@y = 'hello'
+puts @x
+puts @y
+@@classX = 'classy X'
+@@classY = 'classy Y'
+puts @@classX
+puts @@classY
+localX = 'local X'
+localY = 'local Y'
