Item14398: First attrbute should always be the default

If the first attribute does not have a value assignment then it should be the default attribute and not become a boolean. This lets macros like ICON work fine without quoting. ENCODE and INCLUDE don't work with the new parser. All the other Fn_* tests pass.
foswiki · Jul 13, 2017 · bf4a920 · bf4a920
1 parent f160a77
commit bf4a920
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/core/lib/Foswiki/Attrs.pm b/core/lib/Foswiki/Attrs.pm
@@ -263,9 +263,15 @@ sub _friendly {
 
         # simple name with no value (boolean, or _DEFAULT)
         elsif ( $string =~ s/^[\s,]*([a-z][a-z0-9_]*)\b//is ) {
-            $this->{$1} = 1;
 
             #print STDERR "Match9 $1\n";
+            if ( defined( $this->{_DEFAULT} ) ) {
+                $this->{$1} = 1;
+            }
+            else {
+                $key = '_DEFAULT';
+                $this->{_DEFAULT} = $1;
+            }
         }
 
         # otherwise the whole string - sans padding - is the default

diff --git a/core/lib/Foswiki/Macros/ICON.pm b/core/lib/Foswiki/Macros/ICON.pm
@@ -11,9 +11,6 @@ BEGIN {
     }
 }
 
-# Macro takes unquoted default parameter - context-free not supported.
-$Foswiki::contextFreeSyntax{ICON} = 0;
-
 # Uses:
 # _ICONSPACE to reference the meta object of the %ICONTOPIC%,
 # _EXT2ICON to record the mapping of file extensions to icon names

diff --git a/core/lib/Foswiki/Macros/ICONURLPATH.pm b/core/lib/Foswiki/Macros/ICONURLPATH.pm
@@ -6,9 +6,6 @@ use warnings;
 
 use Foswiki::Macros::ICON ();
 
-# Macro takes unquoted default parameter - context-free not supported.
-$Foswiki::contextFreeSyntax{ICONURLPATH} = 0;
-
 BEGIN {
     if ( $Foswiki::cfg{UseLocale} ) {
         require locale;

diff --git a/core/lib/Foswiki/Macros/INCLUDE.pm b/core/lib/Foswiki/Macros/INCLUDE.pm
@@ -7,6 +7,9 @@ use warnings;
 use Foswiki::Render;
 use Foswiki::Func;
 
+# Macro takes unquoted default parameter - context-free not supported.
+$Foswiki::contextFreeSyntax{INCLUDE} = 0;
+
 BEGIN {
     if ( $Foswiki::cfg{UseLocale} ) {
         require locale;