From 2fe3a21a5d2497d4724dd5ebb3da1708057a4ed2 Mon Sep 17 00:00:00 2001
From: Florian Weingarten <flo@hackvalue.de>
Date: Fri, 7 Nov 2014 01:46:59 +0000
Subject: [PATCH] Revert "Merge pull request #479 from Shopify/tweaks-for-c"

This reverts commit aa182f64b49fa5d8a902860873802a9db8ee05b8, reversing
changes made to 70c45f8cd84c753298dd47488b85169458692875.
---
 lib/liquid/block_body.rb | 10 +---------
 performance/profile.rb   |  9 +--------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/lib/liquid/block_body.rb b/lib/liquid/block_body.rb
index 14a3696..1ccba14 100644
--- a/lib/liquid/block_body.rb
+++ b/lib/liquid/block_body.rb
@@ -34,7 +34,7 @@ module Liquid
                   return yield tag_name, markup
                 end
               else
-                raise_missing_tag_terminator(token, options)
+                raise SyntaxError.new(options[:locale].t("errors.syntax.tag_termination".freeze, :token => token, :tag_end => TagEnd.inspect))
               end
             when token.start_with?(VARSTART)
               new_var = create_variable(token, options)
@@ -117,14 +117,6 @@ module Liquid
         markup = token.is_a?(Token) ? token.child(content.first) : content.first
         return Variable.new(markup, options)
       end
-      raise_missing_variable_terminator(token, options)
-    end
-
-    def raise_missing_tag_terminator(token, options)
-      raise SyntaxError.new(options[:locale].t("errors.syntax.tag_termination".freeze, :token => token, :tag_end => TagEnd.inspect))
-    end
-
-    def raise_missing_variable_terminator(token, options)
       raise SyntaxError.new(options[:locale].t("errors.syntax.variable_termination".freeze, :token => token, :tag_end => VariableEnd.inspect))
     end
   end
diff --git a/performance/profile.rb b/performance/profile.rb
index 1feba24..57b6187 100644
--- a/performance/profile.rb
+++ b/performance/profile.rb
@@ -8,17 +8,10 @@ profiler.run
 [:cpu, :object].each do |profile_type|
   puts "Profiling in #{profile_type.to_s} mode..."
   results = StackProf.run(mode: profile_type) do
-    200.times do
+    100.times do
       profiler.run
     end
   end
-
-  if profile_type == :cpu && graph_filename = ENV['GRAPH_FILENAME']
-    File.open(graph_filename, 'w') do |f|
-      StackProf::Report.new(results).print_graphviz(nil, f)
-    end
-  end
-
   StackProf::Report.new(results).print_text(false, 20)
   File.write(ENV['FILENAME'] + "." + profile_type.to_s, Marshal.dump(results)) if ENV['FILENAME']
 end