common parts moved to uiwrap.T

diff --git a/org.glite.lb.client/interface/producer.h.T b/org.glite.lb.client/interface/producer.h.T
index 6d2aa1e..d7cb760 100644 (file)
--- a/org.glite.lb.client/interface/producer.h.T
+++ b/org.glite.lb.client/interface/producer.h.T
@@ -38,161 +38,11 @@ extern "C" {
 
 /* edg_wll_LogEvent shortcuts */
 @@@{
-my $PRINTPROTOTYPESONLY = 1;
-my $PRINTDOC = 1;
-
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       my $func = "edg_wll_Log$t";             # name of generated function
-       my $funcproxy = $func . "Proxy";
-       my $funcc = $func . "CODETOREPLACE";    # name of generated CODE function
-       my $funccproxy = $funcc . "Proxy";
-       my $p = "edg_wll_Context context";      # parameters of generated function
-       my $pc = $p;                            # parameters of generated CODE function
-       my $q = "context,EDG_WLL_EVENT_$tu,EDG_WLL_FORMAT_$tu"; # parameters for LogEvent called in generated function
-       my $qc = $q;                            # parameters for LogEvent called in generated CODE function
-       my $text = "";                          # whole text for generated function
-       my $textproxy = "";                     # whole text for generated CODE function
-       my $doc = " * \\param[in,out] context\tcontext to work with, \n"; # parameters description for generated function
-       my $docc = $doc;                        # parameters description for generated CODE function
-
-       my $decl = "\tint ret;\n";              
-       my $free = "";
-
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->getName;
-               my $sfn = $fn;
-               my $ft = "const ";
-               my $fc = $f->getComment;
-               if ($ULMasString{$f->{type}}) {
-                       $decl .= "\tchar *s_$fn = ".$f->getType()."ToString($fn);\n";
-                       $free .= "\tif (s_$fn) free(s_$fn);\n";
-                       $sfn = "s_$fn";
-               }
-                if ($f->{codes}) {
-# XXX: obsolete         $ft = "enum edg_wll\_$t" . ucfirst $fn;
-                        $ft = $ft . "char *";
-                       $qc = $qc . ", CODETOREPLACE";
-                } else {
-                        $ft = $ft . $f->getType;
-                       $pc = $pc . ", $ft $fn";
-                       $qc = $qc . ", $sfn";
-                       $docc = $docc . " * \\param[in] $fn\t$fc\n";
-                }
-               $p = $p . ", $ft $fn";
-               $q = $q . ", $sfn";
-               $doc = $doc . " * \\param[in] $fn\t$fc\n";
-       }
-       $text = qq{
-/**
- * \\brief $func
- *
- * $func - simple wrapper around edg_wll_LogEvent for event $t
- *
-};
-       $textproxy = qq{
-/**
- * \\brief $funcproxy
- *
- * $funcproxy - simple wrapper around edg_wll_LogEventProxy for event $t
- *
-};
-       if ($PRINTDOC) {
-               $text = $text . $doc . " * \\see edg_wll_LogEvent()\n";
-               $textproxy = $textproxy . $doc . "* \\see edg_wll_LogEventProxy()\n"
-       }
-       $text = $text . " */\n";
-       $textproxy = $textproxy . " */\n";
-       if ($PRINTPROTOTYPESONLY) {
-               $text = $text . "\nextern int $func($p);\n";
-               $textproxy = $textproxy . "\nextern int $funcproxy($p);\n";
-       } else {
-               $text = $text . qq{
-int $func($p)
-\{
-$decl
-       ret = edg_wll_LogEvent($q);
-$free
-       return ret;
-\}
-};
-               $textproxy = $textproxy . qq{
-int $funcproxy($p)
-\{
-$decl
-       ret = edg_wll_LogEventProxy($q);
-$free
-       return ret;
-\}
-};
-       }
-       gen "$text";
-       gen "$textproxy";
-
-       #
-       # generate also CODE functions:
-       #
-       for ($event->getFieldsOrdered) {
-       my $f = selectField $event $_;
-       my $fn = $f->getName;
-       if ($f->{codes}) {
-       for (@{$f->{codes}}) {
-               my $code = uc $_->{name};
-               my $funccc = $funcc; $funccc =~ s/CODETOREPLACE/$code/g;
-               my $funcccproxy = $funccproxy; $funcccproxy =~ s/CODETOREPLACE/$code/g;
-               my $qcc = $qc; $qcc =~ s/CODETOREPLACE/"$code"/g;
-               my $textc = qq{
-/**
- * \\brief $funccc
- *
- * $funccc - simple wrapper around edg_wll_LogEvent for event $t, $fn $code
- *
-};
-               my $textcproxy = qq{
-/**
- * \\brief $funcccproxy
- *
- * $funcccproxy - simple wrapper around edg_wll_LogEventProxy for event $t, $fn $code
- *
-};
-               if ($PRINTDOC) {
-                       $textc = $textc . $docc . " * \\see edg_wll_LogEvent()\n";
-                       $textcproxy = $textcproxy . $docc . " * \\see edg_wll_LogEventProxy()\n";
-               }
-               $textc = $textc . " */\n";
-               $textcproxy = $textcproxy . " */\n";
-               if ($PRINTPROTOTYPESONLY) {
-                       $textc = $textc . "\nextern int $funccc($pc);\n";
-                       $textcproxy = $textcproxy . "\nextern int $funcccproxy($pc);\n";
-               } else {
-                       $textc = $textc . qq{
-int $funccc($pc)
-\{
-$decl
-       ret = edg_wll_LogEvent($qcc);
-$free
-       return ret;
-\}
-};
-                       $textcproxy = $textcproxy . qq{
-int $funcccproxy($pc)
-\{
-$decl
-       ret = edg_wll_LogEventProxy($qcc);
-$free
-       return ret;
-\}
-};
-               }
-               gen "$textc";
-               gen "$textcproxy";
-       } # for codes
-       } # if
-       } # for getFields
-}
+$PRINTPROTOTYPESONLY = 1;
+$PRINTDOC = 1;
+
+require '../src/uiwrap.T';
+
 @@@}
 
 

diff --git a/org.glite.lb.client/src/uiwrap.T b/org.glite.lb.client/src/uiwrap.T
new file mode 100644 (file)
index 0000000..c6c85ca
--- /dev/null
+++ b/org.glite.lb.client/src/uiwrap.T
@@ -0,0 +1,157 @@
+# this file is common for producer.h and uiwrap.c
+# it generates either protoypes (set $PRINTPROTOTYPESONLY to 1) or implementation
+
+for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
+               $event->getTypes) {
+       my $tu = uc $t;
+       my $func = "edg_wll_Log$t";             # name of generated function
+       my $funcproxy = $func . "Proxy";
+       my $funcc = $func . "CODETOREPLACE";    # name of generated CODE function
+       my $funccproxy = $funcc . "Proxy";
+       my $p = "edg_wll_Context context";      # parameters of generated function
+       my $pc = $p;                            # parameters of generated CODE function
+       my $q = "context,EDG_WLL_EVENT_$tu,EDG_WLL_FORMAT_$tu"; # parameters for LogEvent called in generated function
+       my $qc = $q;                            # parameters for LogEvent called in generated CODE function
+       my $text = "";                          # whole text for generated function
+       my $textproxy = "";                     # whole text for generated CODE function
+       my $doc = " * \\param[in,out] context\tcontext to work with, \n"; # parameters description for generated function
+       my $docc = $doc;                        # parameters description for generated CODE function
+
+       my $decl = "\tint ret;\n";              
+       my $free = "";
+
+       selectType $event $t;
+       for ($event->getFieldsOrdered) {
+               my $f = selectField $event $_;
+               my $fn = $f->getName;
+               my $sfn = $fn;
+               my $ft = "const ";
+               my $fc = $f->getComment;
+               if ($ULMasString{$f->{type}}) {
+                       $decl .= "\tchar *s_$fn = ".$f->getType()."ToString($fn);\n";
+                       $free .= "\tif (s_$fn) free(s_$fn);\n";
+                       $sfn = "s_$fn";
+               }
+                if ($f->{codes}) {
+# XXX: obsolete         $ft = "enum edg_wll\_$t" . ucfirst $fn;
+                        $ft = $ft . "char *";
+                       $qc = $qc . ", CODETOREPLACE";
+                } else {
+                        $ft = $ft . $f->getType;
+                       $pc = $pc . ", $ft $fn";
+                       $qc = $qc . ", $sfn";
+                       $docc = $docc . " * \\param[in] $fn\t$fc\n";
+                }
+               $p = $p . ", $ft $fn";
+               $q = $q . ", $sfn";
+               $doc = $doc . " * \\param[in] $fn\t$fc\n";
+       }
+       $text = qq{
+/**
+ * \\brief $func
+ *
+ * $func - simple wrapper around edg_wll_LogEvent for event $t
+ *
+};
+       $textproxy = qq{
+/**
+ * \\brief $funcproxy
+ *
+ * $funcproxy - simple wrapper around edg_wll_LogEventProxy for event $t
+ *
+};
+       if ($PRINTDOC) {
+               $text = $text . $doc . " * \\see edg_wll_LogEvent()\n";
+               $textproxy = $textproxy . $doc . "* \\see edg_wll_LogEventProxy()\n"
+       }
+       $text = $text . " */\n";
+       $textproxy = $textproxy . " */\n";
+       if ($PRINTPROTOTYPESONLY) {
+               $text = $text . "\nextern int $func($p);\n";
+               $textproxy = $textproxy . "\nextern int $funcproxy($p);\n";
+       } else {
+               $text = $text . qq{
+int $func($p)
+\{
+$decl
+       ret = edg_wll_LogEvent($q);
+$free
+       return ret;
+\}
+};
+               $textproxy = $textproxy . qq{
+int $funcproxy($p)
+\{
+$decl
+       ret = edg_wll_LogEventProxy($q);
+$free
+       return ret;
+\}
+};
+       }
+       gen "$text";
+       gen "$textproxy";
+
+       #
+       # generate also CODE functions:
+       #
+       for ($event->getFieldsOrdered) {
+       my $f = selectField $event $_;
+       my $fn = $f->getName;
+       if ($f->{codes}) {
+       for (@{$f->{codes}}) {
+               my $code = uc $_->{name};
+               my $funccc = $funcc; $funccc =~ s/CODETOREPLACE/$code/g;
+               my $funcccproxy = $funccproxy; $funcccproxy =~ s/CODETOREPLACE/$code/g;
+               my $qcc = $qc; $qcc =~ s/CODETOREPLACE/"$code"/g;
+               my $textc = qq{
+/**
+ * \\brief $funccc
+ *
+ * $funccc - simple wrapper around edg_wll_LogEvent for event $t, $fn $code
+ *
+};
+               my $textcproxy = qq{
+/**
+ * \\brief $funcccproxy
+ *
+ * $funcccproxy - simple wrapper around edg_wll_LogEventProxy for event $t, $fn $code
+ *
+};
+               if ($PRINTDOC) {
+                       $textc = $textc . $docc . " * \\see edg_wll_LogEvent()\n";
+                       $textcproxy = $textcproxy . $docc . " * \\see edg_wll_LogEventProxy()\n";
+               }
+               $textc = $textc . " */\n";
+               $textcproxy = $textcproxy . " */\n";
+               if ($PRINTPROTOTYPESONLY) {
+                       $textc = $textc . "\nextern int $funccc($pc);\n";
+                       $textcproxy = $textcproxy . "\nextern int $funcccproxy($pc);\n";
+               } else {
+                       $textc = $textc . qq{
+int $funccc($pc)
+\{
+$decl
+       ret = edg_wll_LogEvent($qcc);
+$free
+       return ret;
+\}
+};
+                       $textcproxy = $textcproxy . qq{
+int $funcccproxy($pc)
+\{
+$decl
+       ret = edg_wll_LogEventProxy($qcc);
+$free
+       return ret;
+\}
+};
+               }
+               gen "$textc";
+               gen "$textcproxy";
+       } # for codes
+       } # if
+       } # for getFields
+}
+
+1;

diff --git a/org.glite.lb.client/src/uiwrap.c.T b/org.glite.lb.client/src/uiwrap.c.T
index 4c71b39..1f5d8f6 100644 (file)
--- a/org.glite.lb.client/src/uiwrap.c.T
+++ b/org.glite.lb.client/src/uiwrap.c.T
@@ -9,159 +9,9 @@
 #include "producer.h"
 
 @@@{
-my $PRINTPROTOTYPESONLY = 0;
-my $PRINTDOC = 0;
+$PRINTPROTOTYPESONLY = 0;
+$PRINTDOC = 0;
 
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       my $func = "edg_wll_Log$t";             # name of generated function
-       my $funcproxy = $func . "Proxy";
-       my $funcc = $func . "CODETOREPLACE";    # name of generated CODE function
-       my $funccproxy = $funcc . "Proxy";
-       my $p = "edg_wll_Context context";      # parameters of generated function
-       my $pc = $p;                            # parameters of generated CODE function
-       my $q = "context,EDG_WLL_EVENT_$tu,EDG_WLL_FORMAT_$tu"; # parameters for LogEvent called in generated function
-       my $qc = $q;                            # parameters for LogEvent called in generated CODE function
-       my $text = "";                          # whole text for generated function
-       my $textproxy = "";                     # whole text for generated CODE function
-       my $doc = " * \\param[in,out] context\tcontext to work with, \n"; # parameters description for generated function
-       my $docc = $doc;                        # parameters description for generated CODE function
+require '../src/uiwrap.T';
 
-       my $decl = "\tint ret;\n";              
-       my $free = "";
-
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->getName;
-               my $sfn = $fn;
-               my $ft = "const ";
-               my $fc = $f->getComment;
-               if ($ULMasString{$f->{type}}) {
-                       $decl .= "\tchar *s_$fn = ".$f->getType()."ToString($fn);\n";
-                       $free .= "\tif (s_$fn) free(s_$fn);\n";
-                       $sfn = "s_$fn";
-               }
-                if ($f->{codes}) {
-# XXX: obsolete         $ft = "enum edg_wll\_$t" . ucfirst $fn;
-                        $ft = $ft . "char *";
-                       $qc = $qc . ", CODETOREPLACE";
-                } else {
-                        $ft = $ft . $f->getType;
-                       $pc = $pc . ", $ft $fn";
-                       $qc = $qc . ", $sfn";
-                       $docc = $docc . " * \\param[in] $fn\t$fc\n";
-                }
-               $p = $p . ", $ft $fn";
-               $q = $q . ", $sfn";
-               $doc = $doc . " * \\param[in] $fn\t$fc\n";
-       }
-       $text = qq{
-/**
- * \\brief $func
- *
- * $func - simple wrapper around edg_wll_LogEvent for event $t
- *
-};
-       $textproxy = qq{
-/**
- * \\brief $funcproxy
- *
- * $funcproxy - simple wrapper around edg_wll_LogEventProxy for event $t
- *
-};
-       if ($PRINTDOC) {
-               $text = $text . $doc . " * \\see edg_wll_LogEvent()\n";
-               $textproxy = $textproxy . $doc . "* \\see edg_wll_LogEventProxy()\n"
-       }
-       $text = $text . " */\n";
-       $textproxy = $textproxy . " */\n";
-       if ($PRINTPROTOTYPESONLY) {
-               $text = $text . "\nextern int $func($p);\n";
-               $textproxy = $textproxy . "\nextern int $funcproxy($p);\n";
-       } else {
-               $text = $text . qq{
-int $func($p)
-\{
-$decl
-       ret = edg_wll_LogEvent($q);
-$free
-       return ret;
-\}
-};
-               $textproxy = $textproxy . qq{
-int $funcproxy($p)
-\{
-$decl
-       ret = edg_wll_LogEventProxy($q);
-$free
-       return ret;
-\}
-};
-       }
-       gen "$text";
-       gen "$textproxy";
-
-       #
-       # generate also CODE functions:
-       #
-       for ($event->getFieldsOrdered) {
-       my $f = selectField $event $_;
-       my $fn = $f->getName;
-       if ($f->{codes}) {
-       for (@{$f->{codes}}) {
-               my $code = uc $_->{name};
-               my $funccc = $funcc; $funccc =~ s/CODETOREPLACE/$code/g;
-               my $funcccproxy = $funccproxy; $funcccproxy =~ s/CODETOREPLACE/$code/g;
-               my $qcc = $qc; $qcc =~ s/CODETOREPLACE/"$code"/g;
-               my $textc = qq{
-/**
- * \\brief $funccc
- *
- * $funccc - simple wrapper around edg_wll_LogEvent for event $t, $fn $code
- *
-};
-               my $textcproxy = qq{
-/**
- * \\brief $funcccproxy
- *
- * $funcccproxy - simple wrapper around edg_wll_LogEventProxy for event $t, $fn $code
- *
-};
-               if ($PRINTDOC) {
-                       $textc = $textc . $docc . " * \\see edg_wll_LogEvent()\n";
-                       $textcproxy = $textcproxy . $docc . " * \\see edg_wll_LogEventProxy()\n";
-               }
-               $textc = $textc . " */\n";
-               $textcproxy = $textcproxy . " */\n";
-               if ($PRINTPROTOTYPESONLY) {
-                       $textc = $textc . "\nextern int $funccc($pc);\n";
-                       $textcproxy = $textcproxy . "\nextern int $funcccproxy($pc);\n";
-               } else {
-                       $textc = $textc . qq{
-int $funccc($pc)
-\{
-$decl
-       ret = edg_wll_LogEvent($qcc);
-$free
-       return ret;
-\}
-};
-                       $textcproxy = $textcproxy . qq{
-int $funcccproxy($pc)
-\{
-$decl
-       ret = edg_wll_LogEventProxy($qcc);
-$free
-       return ret;
-\}
-};
-               }
-               gen "$textc";
-               gen "$textcproxy";
-       } # for codes
-       } # if
-       } # for getFields
-}
 @@@}