Changeset 66 in text-formbuilder for trunk/lib/Text

Timestamp:

03/11/05 15:17:59 (20 years ago)

Author:

peichman

Message:

worked on the rules for parsing lists in the grammar
allow end of field line comments
growable fields can specify a limit; e.g. "person*4" to limit to 4
use '+other' to specify that a field should have an 'Other' option (FB 3.02)
rearranged TODOs in the main documentation

Location:

trunk/lib/Text

Files:

• FormBuilder.pm (modified) (6 diffs)
• FormBuilder/grammar (modified) (6 diffs)

trunk/lib/Text/FormBuilder.pm

@@ -7 +7 @@
 use vars qw($VERSION @EXPORT);
 
-$VERSION = '0.09';
+$VERSION = '0.10';
 @EXPORT = qw(create_form);
 
@@ -241 +241 @@
         defined $$field{$_} or delete $$field{$_} foreach keys %{ $field };
         
-        unless ($FB_version >= '3.002') {
-            if ($$field{growable}) {
-                warn '[' . (caller(0))[3] . "] growable fields not supported by FB $FB_version (requires 3.002)";
-                delete $$field{growable};
+        unless ($FB_version >= '3.02') {
+            for (qw(growable other)) {
+                if ($$field{$_}) {
+                    warn '[' . (caller(0))[3] . "] '$_' fields not supported by FB $FB_version (requires 3.02)";
+                    delete $$field{$_};
+                }
             }
         }
@@ -509 +511 @@
                     $OUT .= qq[<th></th>];
                 } else {
-                    $OUT .= '<th class="label">' . ($$_{required} ? qq[<strong class="required">$$_{label}:</strong>] : "$$_{label}:") . '</th>';
+                    $OUT .= '<th class="label">' . ($$_{required} ? qq[<strong class="required">$$_{label}</strong>] : "$$_{label}") . '</th>';
                 }
                 
@@ -1160 +1162 @@
 =head1 TODO
 
-Document the commmand line tool
+=head2 Documentation/Tests
 
 Document use of the parser as a standalone module
+
+Better tests!
+
+=head2 Language/Parser
 
 Allow renaming of the submit button; allow renaming and inclusion of a 
@@ -1172 +1178 @@
 validate. These should cause C<build> to emit a warning before ignoring them.
 
+C<!include> directive to include external formspec files
+
+=head2 Code generation/Templates
+
+Alternative format using C<< <fieldset> >> tags instead of C<< <h2> >>
+section headers
+
 Make the generated modules into subclasses of CGI::FormBuilder
+
+Better integration with L<CGI::FormBuilder>'s templating system
 
 Allow for custom wrappers around the C<form_template>
@@ -1178 +1193 @@
 Maybe use HTML::Template instead of Text::Template for the built in template
 (since CGI::FormBuilder users may be more likely to already have HTML::Template)
-
-C<!include> directive to include external formspec files
-
-Better tests!
 
 =head1 BUGS

trunk/lib/Text/FormBuilder/grammar

@@ -1 @@
-{ 
+{
+    #$::RD_TRACE = 1;
     my (
         $context,      # line or group
@@ -56 +57 @@
     { $lists{$item{var_name}} = [ @options ]; @options = () }
 
-static_list: '{' option(s /,\s*/) /,?/ '}'
+static_list: '{' /\s*/ option(s /\s*,\s*/) /,?/ /\s*/ '}'
 
 dynamic_list: '&' <perl_codeblock>
@@ -160 +161 @@
 
 # this is the real heart of the thing
-field: name field_size(?) growable(?) label(?) hint(?) type(?) default(?) option_list(?) validate(?)
+field: name field_size(?) growable(?) label(?) hint(?) type(?) other(?) default(?) option_list(?) validate(?) comment(?)
     {
         my $field = {
             name     => $item{name},
-            growable => ($item{'growable(?)'}[0] ? 1 : 0),
+            growable => $item{'growable(?)'}[0],
             label    => $item{'label(?)'}[0],
             comment  => $item{'hint(?)'}[0],
             type     => $item{'type(?)'}[0],
+            other    => $item{'other(?)'}[0],
             value    => $item{'default(?)'}[0],
             list     => $list_var,
@@ -214 +216 @@
     { $rows = $item[1]; $cols = $item[3] }
 
-growable: '*'
+growable: '*' limit(?) { $item{'limit(?)'}[0] || 1 }
+
+limit: /\d+/
 
 label: '|' (simple_multiword | quoted_string) { $item[2] }
@@ -224 +228 @@
 builtin_field: /textarea|text|password|file|checkbox|radio|select|hidden|static/
 
+other: '+' 'other' { 1 }
 
 default: '=' (simple_multiword | quoted_string) { $item[2] }
 
 # for simple multiword values not involving punctuation
-simple_multiword: <skip:''> /[\w\t ]+/ { $item[2] }
+simple_multiword: <skip:''> /\w[\w\t ]+/ { $item[2] }
 
 # my attempt at a single-quoted, non-interpolating string
@@ -237 +242 @@
 option_list: options | list_var
     
-options: '{' option(s /,\s*/) '}'
+options: '{' option(s /,/) '}'
 
 list_var: /@[A-Z_]+/ { $list_var = $item[1] }
 
-option: (simple_multiword | value | quoted_string) display_text(?)
+option: (simple_multiword | quoted_string) display_text(?)
     { push @options, { $item[1] => $item{'display_text(?)'}[0] } }