gnue/geas/lib/classdefs yparser.y

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/08/23 05:54:01

Modified files:
        geas/lib/classdefs: yparser.y 

Log message:
        Quick fix to clean up syntax for NOT NUL

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/geas/lib/classdefs/yparser.y.diff?tr1=1.36&tr2=1.37&r1=text&r2=text

Patches:
Index: gnue/geas/lib/classdefs/yparser.y
diff -u gnue/geas/lib/classdefs/yparser.y:1.36 
gnue/geas/lib/classdefs/yparser.y:1.37
--- gnue/geas/lib/classdefs/yparser.y:1.36      Mon Jul  2 12:44:26 2001
+++ gnue/geas/lib/classdefs/yparser.y   Thu Aug 23 05:54:01 2001
@@ -11,6 +11,7 @@
 
       /* use the more useful verbose error messages */
 #define YYERROR_VERBOSE 1
+#define YYDEBUG 1
 
       /* defaults to everything public */
 unsigned long int current_access = ODL_ACCESS_PUBLIC;
@@ -306,7 +307,7 @@
                           }
   ;
 
-new_field_name: SYMBOL { $$ = $1; }
+new_field_name: SYMBOL fp_on { $$ = $1; }
   ;
 
 existing_field_name: SYMBOL   { $$ = $1; }
@@ -449,11 +450,12 @@
   |         properties property  { $$ = $1 | $2; }
   ;
 
-opt_properties: /* */                       { $$ = ODL_PROP_NONE; }
-  |             '!' fp_on properties fp_off { $$ = $3; }
+opt_properties: /* */      { $$ = ODL_PROP_NONE; }
+  |             properties { $$ = $1; }
   ;
 
-new_field: new_field_name opt_format opt_default opt_properties {
+
+new_field: new_field_name opt_format opt_default opt_properties fp_off {
                $$ = alloc_odl_item();
                if( $$ )
                {
@@ -473,10 +475,10 @@
   |             new_field_list ',' new_field { $$ = g_list_append($1,$3);   }
   ;
 
-readonly: new_field_name ':' existing_field_name   {}
+readonly: new_field_name fp_off ':' existing_field_name   {}
   ;
 
-method: new_field_name '(' dt_on opt_argument_list ')' dt_off  {
+method: new_field_name fp_off '(' dt_on opt_argument_list ')' dt_off  {
               odl_item *i = alloc_odl_item();
               if( i )
               {
@@ -485,7 +487,7 @@
                   i->base.name   = $1;
                   i->base.access = current_access;
                   i->fieldtype   = FT_method;
-                  i->arguments   = $4;
+                  i->arguments   = $5;
               }
               $$ = i;
           }
@@ -556,7 +558,7 @@
       }
   ;
 
-lookup: new_field_name ':' lookup_data_source '=' search_fields  {
+lookup: new_field_name fp_off ':' lookup_data_source '=' search_fields  {
             odl_item *i = alloc_odl_item();
             g_assert( i != NULL);
             if( i )
@@ -566,15 +568,15 @@
                 i->base.name     = $1;
                 i->base.access   = current_access;
                 i->fieldtype     = FT_lookup;
-                i->source_fields = $3->fields;
-                i->this_fields   = $5;
-                i->sourceclass   = $3->classname;
-                i->sourcefield   = $3->field;
-
-                $3->classname = NULL;
-                $3->fields = NULL;
-                $3->field  = NULL;
-                free_odl_datasource($3);
+                i->source_fields = $4->fields;
+                i->this_fields   = $6;
+                i->sourceclass   = $4->classname;
+                i->sourcefield   = $4->field;
+
+                $4->classname = NULL;
+                $4->fields = NULL;
+                $4->field  = NULL;
+                free_odl_datasource($4);
 
                 $$ = i;
             }
@@ -585,7 +587,7 @@
         }
   ;
 
-list: new_field_name ':' list_data_source '=' search_fields   {
+list: new_field_name fp_off ':' list_data_source '=' search_fields   {
             odl_item *i = NULL;
             
             if( current_pass == 1 )
@@ -600,15 +602,15 @@
                 i->base.name     = $1;
                 i->base.access   = current_access;
                 i->fieldtype     = FT_list;
-                i->source_fields = $3->fields;
-                i->this_fields   = $5;
-                i->sourceclass   = $3->classname;
+                i->source_fields = $4->fields;
+                i->this_fields   = $6;
+                i->sourceclass   = $4->classname;
                 i->datatype      = DT_class;
                 i->datatypeclass = g_strdup( i->sourceclass );
 
-                $3->classname = NULL;
-                $3->fields = NULL;
-                free_odl_datasource($3);
+                $4->classname = NULL;
+                $4->fields = NULL;
+                free_odl_datasource($4);
 
                 $$ = i;
               }
@@ -620,7 +622,7 @@
         }
   ;
 
-reference: new_field_name ':' reference_data_source '=' search_fields   {
+reference: new_field_name fp_off ':' reference_data_source '=' search_fields   
{
             odl_item *i = NULL;
             
             if( current_pass == 1 ) i = alloc_odl_item();
@@ -631,15 +633,15 @@
                 i->base.name     = $1;
                 i->base.access   = current_access;
                 i->fieldtype     = FT_reference;
-                i->source_fields = $3->fields;
-                i->this_fields   = $5;
-                i->sourceclass   = $3->classname;
+                i->source_fields = $4->fields;
+                i->this_fields   = $6;
+                i->sourceclass   = $4->classname;
                 i->datatype      = DT_class;
                 i->datatypeclass = g_strdup( i->sourceclass );
 
-                $3->classname = NULL;
-                $3->fields = NULL;
-                free_odl_datasource($3);
+                $4->classname = NULL;
+                $4->fields = NULL;
+                free_odl_datasource($4);
 
                 $$ = i;
             }