teepee 0.12.6 → 0.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80d3b41e120755474c7f5f07bb933f931ea346f5
-  data.tar.gz: 4509080cb66640a3ca8da2520f500a316bdc2e4b
+  metadata.gz: 86c89b8367d7c548ca8489fc0c4d2cbb40487649
+  data.tar.gz: 441b9d33fb2f9392c316fd83e03fcf98b66d5e05
 SHA512:
-  metadata.gz: 12212ac9b8c23ee02a13861614b4fc51e8eb0c083b9380af8a01a590826381a40353decc127212b6d61a3b38d555c491ba4c881d932d101044572afe40a0a24b
-  data.tar.gz: d62c4c44f2b2b097b326578818088811c560382f5824acd9b9fd29e1ac7085306b025d45eac7af101009a244d946f35dede5e19ae02ef8f5213c73552bf7816c
+  metadata.gz: 092e7de71f78de726505ea2271a4c002a4e8afa4ece2fa7c832f569e792fff9d095063061d4ea661edd2fce929457ee3e7452fc2b745ef32cf450087637f5080
+  data.tar.gz: 1784bac371758e09ac7ab0d6f63c668764eb8462d5c69cc4780f27925e9875c9da24f95aa53cec7b125dcc5f11ac409ea15218a8dbf8ed362de127b72c41bd8d

data/lib/teepee/command-parser.rb

@@ -396,8 +396,14 @@ module Teepee
         @@commander.unless_operator expressions
       when "do"
         @@commander.do_operator expressions
+      when "prog1"
+        @@commander.prog1_operator expressions
+      when "progn"
+        @@commander.progn_operator expressions
       when "cond"
         @@commander.cond_operator expressions
+      when "case"
+        @@commander.case_operator expressions
       else
         command_error "unknown command #{command.to_html}"
       end

data/lib/teepee/commander.rb

@@ -317,6 +317,21 @@ module Teepee
       html_tag :br, nil
     end
 
+    def case_operator expressions
+      value, _, *rest = strip expressions
+      if value and not rest.empty?
+        def cond_helper value, expressions
+          test_value, _, form, *rest = strip expressions
+          if equal value, test_value
+            form
+          elsif not rest.empty?
+            cond_helper value, rest
+          end
+        end
+        cond_helper value, rest
+      end
+    end
+
     def cond_operator expressions
       conditional, _, form, *rest = strip expressions
       if true_constant? conditional
@@ -354,13 +369,13 @@ module Teepee
       Math::E
     end
 
-    def equal *numbers
-      if numbers.empty?
+    def equal *expressions
+      if expressions.empty?
         true_constant
-      elsif numbers.length == 1
+      elsif expressions.length == 1
         true_constant
       else
-        numbers[0] == numbers[1] and equal *numbers.rest
+        expressions[0].to_s == expressions[1].to_s and equal *expressions.rest
       end
     end
 
@@ -634,6 +649,14 @@ module Teepee
       "|"
     end
 
+    def prog1_operator expressions
+      expressions.first
+    end
+
+    def progn_operator expressions
+      expressions.last
+    end
+
     def radians2degrees radians
       ensure_numeric(radians * 180.0 / Math::PI)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teepee
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.12.7
 platform: ruby
 authors:
 - Christopher Mark Gore