Changeset 57 in text-formbuilder for trunk

Timestamp:

01/18/05 15:19:14 (19 years ago)

Author:

peichman

Message:

BUGFIX: can have "unbalanced" quotes in note or description blocks (wrote own grammar rule instead of using the built-in <perl_codeblock> directive)

Location:

trunk

Files:

• Changes (modified) (1 diff)
• lib/Text/FormBuilder.pm (modified) (3 diffs)
• lib/Text/FormBuilder/grammar (modified) (5 diffs)

trunk/Changes

@@ -3 +3 @@
 0.09
     * single-line textfields can be given a maxlength
+    * BUGFIX: !note and !description blocks can now
+      contain "unbalanced" quotes (fixed the gramamr)
     
 0.08 - 10 Jan 2005

trunk/lib/Text/FormBuilder.pm

@@ -982 +982 @@
 =back
 
-B<Known BUG:> If you include an odd number of C<'> or C<"> characters in a
-C<!description> or C<!note>, then that directive will mistakenly be skipped.
-This is a bug casued by me taking a shortcut in the parser C<:-/>
-
 =head2 Fields
 
@@ -1162 +1158 @@
 =head1 TODO
 
-Improve the commmand line tools
+Document the commmand line tool
 
 Allow renaming of the submit button; allow renaming and inclusion of a 
@@ -1193 +1189 @@
 =head1 BUGS
 
-Having a single C<'> or C<"> in a C<!description> or C<!note> directive causes that
-directive to get skipped. This is an issue with the C<perl_codeblock> shortcut in
-Parse::RecDescent.
-
 Creating two $parsers in the same script causes the second one to get the data
 from the first one.

trunk/lib/Text/FormBuilder/grammar

@@ -68 +68 @@
     }
 
-description_def: '!description' <perl_codeblock>
+description_def: '!description' block
     { warn "[Text::FormBuilder] Description redefined at input text line $thisline\n" if defined $description;
     
@@ -85 +85 @@
     }
 
-note: '!note' <perl_codeblock>
+note: '!note' block
     {   
         (my $note = $item[2]) =~ s/^{\s*|\s*}$//g;
@@ -91 +91 @@
     }
 
+# curly-brace delimited block, that can contain properly
+# nested curly brackets, along with any other characters
+# return with the '{...}' so that nested blocks get the
+# brackets treated as literals
+block: '{' <skip:''> block_content(s) '}'
+    {
+        '{' . join('', @{ $item[3] }) . '}';
+    }
+
+block_content: /[^\{\}]+?/ | block
+
 
 field_line: <skip:'[ \t]*'> ( field | comment | blank ) "\n"
@@ -97 +108 @@
 title: '!title' /.*/
     {
-        warn "[Text::Formbuilder] Title redefined at input text line $thisline\n" if defined $title;
+        warn "[Text::FormBuilder] Title redefined at input text line $thisline\n" if defined $title;
         $title = $item[2];
     }
@@ -103 +114 @@
 author: '!author' /.*/
     {
-        warn "[Text::Formbuilder] Author redefined at input text line $thisline\n" if defined $author;
+        warn "[Text::FormBuilder] Author redefined at input text line $thisline\n" if defined $author;
         $author = $item[2];
     }