bam

pgbovine · pgbovine · commit 004e8ee540e2 · 2015-07-16T02:39:31.000-07:00
diff --git a/v3/js/opt-frontend.js b/v3/js/opt-frontend.js
@@ -574,6 +574,8 @@ var RUBY_EXAMPLES = {
   rubyPrivateProtectedLink: 'ruby-example-code/class-private-protected.rb',
   rubyInstClassVarsComplexLink: 'ruby-example-code/inst-class-vars-complex.rb',
   rubyToplevelLink: 'ruby-example-code/toplevel-inst-class-vars.rb',
+  rubyBlocksScoping3Link: 'ruby-example-code/blocks-scoping-3.rb',
+  rubyProcReturnLink: 'ruby-example-code/proc-return.rb',
 };
 
 var chatBox = undefined;
diff --git a/v3/ruby-example-code/blocks-scoping-3.rb b/v3/ruby-example-code/blocks-scoping-3.rb
@@ -0,0 +1,23 @@
+# how does lexical scoping work for blocks?
+
+x = 5
+
+def gimme
+  yield
+  puts "end of gimme"
+end
+
+def bar
+  y = 42
+  gimme do
+    # everything inside of here can access y but *not* x
+    puts 'Hello'
+    puts y
+    y += 1000
+    puts y
+  end
+  puts 'end of bar'
+  puts y
+end
+
+bar
diff --git a/v3/ruby-example-code/proc-return.rb b/v3/ruby-example-code/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/v3/visualize.html b/v3/visualize.html
@@ -392,10 +392,12 @@
   <a class="exampleLink" id="rubyGlobalsLink" href="#">Globals</a> |
   <a class="exampleLink" id="rubyConstantsLink" href="#">Constants</a> |
   <a class="exampleLink" id="rubyBlocksLink" href="#">Blocks</a> |
-  <a class="exampleLink" id="rubyBlocksScopingLink" href="#">Block scoping</a>
+  <a class="exampleLink" id="rubyBlocksScopingLink" href="#">Block scoping</a> |
+  <a class="exampleLink" id="rubyBlocksScoping3Link" href="#">More block scoping</a>
   <p/>
-  <a class="exampleLink" id="rubyProcLink" href="#">Procs</a> |
+  <a class="exampleLink" id="rubyProcLink" href="#">Proc & Lambda</a> |
   <a class="exampleLink" id="rubyProcScopingLink" href="#">Proc scoping</a> |
+  <a class="exampleLink" id="rubyProcReturnLink" href="#">Proc return</a> |
   <a class="exampleLink" id="rubyLambdaScopingLink" href="#">Lambda scoping</a> |
   <a class="exampleLink" id="rubyInheritanceLink" href="#">Inheritance</a> |
   <a class="exampleLink" id="rubySymbolsLink" href="#">Symbols</a>
