Item9783: Fixed bug where a variable name that contained a string ope…

…ration command resulted in a syntax error git-svn-id: http://svn.foswiki.org/trunk/FreeMarkerPlugin@9475 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Oct 2, 2010 · e02983a · e02983a
1 parent 23d9df0
commit e02983a
Show file tree

Hide file tree

Showing 5 changed files with 1,316 additions and 1,271 deletions.
diff --git a/data/System/FreeMarkerPlugin.txt b/data/System/FreeMarkerPlugin.txt
@@ -367,7 +367,8 @@ One line description, required for extensions repository catalog.
 |  Release: | %$RELEASE% |
 |  Version: | %$VERSION% |
 |  Change&nbsp;History: | <!-- versions below in reverse order -->&nbsp; |
-|  12 May 2010 (1.0) | First release |
+|  03 Oct 2010 | 1.0.1: Fixed bug where a variable name that contained a string operation command resulted in a syntax error. | 
+|  12 May 2010 | 1.0.0: First release |
 |  Home: | http://foswiki.org/Extensions/%TOPIC% |
 |  Support: | http://foswiki.org/Support/%TOPIC% |
 

diff --git a/lib/Foswiki/Plugins/FreeMarkerPlugin.pm b/lib/Foswiki/Plugins/FreeMarkerPlugin.pm
@@ -9,7 +9,7 @@ use Foswiki::Plugins::FreeMarkerPlugin::AttributeParser qw(new parse);
 use Foswiki::Plugins::FreeMarkerPlugin::FreeMarkerParser qw(new parse);
 
 our $VERSION = '$Rev: 4533 $';
-our $RELEASE           = '1.0';
+our $RELEASE           = '1.0.1';
 our $SHORTDESCRIPTION  = '<nop>FreeMarker template parser';
 our $NO_PREFS_IN_TOPIC = 1;
 our $pluginName        = 'FreeMarkerPlugin';

diff --git a/lib/Foswiki/Plugins/FreeMarkerPlugin/FreeMarkerGrammar.yp b/lib/Foswiki/Plugins/FreeMarkerPlugin/FreeMarkerGrammar.yp
@@ -1384,7 +1384,7 @@ s/^\b(sort_by|sort|size|seq_index_of|seq_contains|reverse|last|join|first)\b\s*/
             # string operations
             return ( $1, $1 )
               if (
-s/^(word_list|upper_case|uncap_first|substring|string|replace|lower_case|length|xhtml|html|eval|capitalize|cap_first)\s*//
+s/^\b(word_list|upper_case|uncap_first|substring|string|replace|lower_case|length|xhtml|html|eval|capitalize|cap_first)\b\s*//
               );
 
             # sequence operations

diff --git a/lib/Foswiki/Plugins/FreeMarkerPlugin/FreeMarkerParser.pm b/lib/Foswiki/Plugins/FreeMarkerPlugin/FreeMarkerParser.pm
@@ -4875,7 +4875,7 @@ s/^\b(sort_by|sort|size|seq_index_of|seq_contains|reverse|last|join|first)\b\s*/
             # string operations
             return ( $1, $1 )
               if (
-s/^(word_list|upper_case|uncap_first|substring|string|replace|lower_case|length|xhtml|html|eval|capitalize|cap_first)\s*//
+s/^\b(word_list|upper_case|uncap_first|substring|string|replace|lower_case|length|xhtml|html|eval|capitalize|cap_first)\b\s*//
               );
 
             # sequence operations