[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/appserver/src/_featuretest GodlParser.py O...
|
From: |
Daniel E. Baumann |
|
Subject: |
gnue/appserver/src/_featuretest GodlParser.py O... |
|
Date: |
Mon, 16 Sep 2002 00:44:03 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Daniel E. Baumann <address@hidden> 02/09/16 00:44:03
Modified files:
appserver/src/_featuretest: GodlParser.py Objects.py
thekitchensink.godl
Log message:
Godl parser crack.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/_featuretest/GodlParser.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/_featuretest/Objects.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/_featuretest/thekitchensink.godl.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: gnue/appserver/src/_featuretest/GodlParser.py
diff -c gnue/appserver/src/_featuretest/GodlParser.py:1.2
gnue/appserver/src/_featuretest/GodlParser.py:1.3
*** gnue/appserver/src/_featuretest/GodlParser.py:1.2 Wed Sep 4 00:15:58 2002
--- gnue/appserver/src/_featuretest/GodlParser.py Mon Sep 16 00:44:03 2002
***************
*** 19,25 ****
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: GodlParser.py,v 1.2 2002/09/04 04:15:58 baumannd Exp $
import Objects
from gnue.common import GTypecast, GParser
--- 19,25 ----
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: GodlParser.py,v 1.3 2002/09/16 04:44:03 baumannd Exp $
import Objects
from gnue.common import GTypecast, GParser
***************
*** 44,51 ****
#
#
! xmlElements =
! {
'odl_specification':
{
'BaseClass': Objects.GodlSpec,
--- 44,50 ----
#
#
! xmlElements = {
'odl_specification':
{
'BaseClass': Objects.GodlSpec,
***************
*** 79,84 ****
--- 78,106 ----
'typedef':
{
'BaseClass': Objects.GodlTypedef,
+ 'SingleInstance': 0,
+ 'ParentTags': ('odl_definition',)
+ },
+
+ 'struct':
+ {
+ 'BaseClass': Objects.GodlStruct,
+ 'Attributes':
+ {
+ 'id':
+ {
+ 'Required': 1,
+ 'Unique': 1,
+ 'Typecast': GTypecast.name
+ }
+ },
+ 'SingleInstance': 0,
+ 'ParentTags': ('odl_definition',)
+ },
+
+ 'union':
+ {
+ 'BaseClass': Objects.GodlStruct,
'SingleInstance': 0,
'ParentTags': ('odl_definition',)
},
Index: gnue/appserver/src/_featuretest/Objects.py
diff -c gnue/appserver/src/_featuretest/Objects.py:1.1
gnue/appserver/src/_featuretest/Objects.py:1.2
*** gnue/appserver/src/_featuretest/Objects.py:1.1 Tue Sep 3 00:02:20 2002
--- gnue/appserver/src/_featuretest/Objects.py Mon Sep 16 00:44:03 2002
***************
*** 19,25 ****
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: Objects.py,v 1.1 2002/09/03 04:02:20 baumannd Exp $
from gnue.common.GObjects import GObj
import GodlParser
--- 19,25 ----
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: Objects.py,v 1.2 2002/09/16 04:44:03 baumannd Exp $
from gnue.common.GObjects import GObj
import GodlParser
***************
*** 29,35 ****
class GodlSpec(GodlObject):
def __init__(self, parent=None):
! GodlObject.__init__(self, parent, type='GodlSpec')
def dumpXML(self, treeDump=1, gap=" "):
return GodlObject.dumpXML(self,
--- 29,35 ----
class GodlSpec(GodlObject):
def __init__(self, parent=None):
! GodlObject.__init__(self, parent, type='GodlSpec')
def dumpXML(self, treeDump=1, gap=" "):
return GodlObject.dumpXML(self,
Index: gnue/appserver/src/_featuretest/thekitchensink.godl
diff -c gnue/appserver/src/_featuretest/thekitchensink.godl:1.7
gnue/appserver/src/_featuretest/thekitchensink.godl:1.8
*** gnue/appserver/src/_featuretest/thekitchensink.godl:1.7 Tue Sep 3
00:02:20 2002
--- gnue/appserver/src/_featuretest/thekitchensink.godl Mon Sep 16 00:44:03 2002
***************
*** 1,3 ****
--- 1,4 ----
+ <?xml version="1.0"?>
<!--
This file serves no real functional purpose other than to amuse
and to present various markup allowed in GODL which will be used to
***************
*** 9,16 ****
in determining how to handle things that are not contained in a
module.
-->
-
- <?xml version="1.0"?>
<odl_specification>
<odl_definition>
<typedef>
--- 10,15 ----
***************
*** 29,35 ****
</declarators>
</typedef>
! <typdef>
<type_spec>
<sequence><type_spec>float</type_spec></sequence>
</type_spec>
--- 28,34 ----
</declarators>
</typedef>
! <typedef>
<type_spec>
<sequence><type_spec>float</type_spec></sequence>
</type_spec>
***************
*** 38,44 ****
</declarators>
</typedef>
! <typdef>
<type_spec>string</type_spec>
<declarators>
<declarator>StringType</declarator>
--- 37,43 ----
</declarators>
</typedef>
! <typedef>
<type_spec>string</type_spec>
<declarators>
<declarator>StringType</declarator>
***************
*** 125,131 ****
<type_spec><struct>Bar</struct></type_spec>
<declarators>
<declarator>bar</declarator>
! </declarator>
</typedef>
<typedef>
--- 124,130 ----
<type_spec><struct>Bar</struct></type_spec>
<declarators>
<declarator>bar</declarator>
! </declarators>
</typedef>
<typedef>
***************
*** 140,146 ****
<declarators>
<declarator>trout_type</declarator>
</declarators>
! </tyepdef>
<typedef>
<type_spec>
--- 139,145 ----
<declarators>
<declarator>trout_type</declarator>
</declarators>
! </typedef>
<typedef>
<type_spec>
***************
*** 685,691 ****
<type_spec><union>MyUnion</union></type_spec>
<declarators>
<declarator>my_union</declarator>
! </declarator>
</typedef>
<typedef>
--- 684,690 ----
<type_spec><union>MyUnion</union></type_spec>
<declarators>
<declarator>my_union</declarator>
! </declarators>
</typedef>
<typedef>
***************
*** 736,742 ****
<interface id="CodeSlave"/>
<class id="Goats::Goat"/>
! <const id="MADGOATS"/>
<type_spec>
<boolean>TRUE</boolean>
</type_spec>
--- 735,741 ----
<interface id="CodeSlave"/>
<class id="Goats::Goat"/>
! <const id="MADGOATS">
<type_spec>
<boolean>TRUE</boolean>
</type_spec>
***************
*** 804,810 ****
<exception id="NoTicketsAssigned"/>
<attribute readonly="1">
! <type_sepc>string</type_spec>
<name>favoriteColor</name>
</attribute>
--- 803,809 ----
<exception id="NoTicketsAssigned"/>
<attribute readonly="1">
! <type_spec>string</type_spec>
<name>favoriteColor</name>
</attribute>
***************
*** 838,844 ****
<operation oneway="1" id="speakInIRCChannel"/>
! <operaion id="isWatching">
<returns>
<type_spec>boolean</type_spec>
</returns>
--- 837,843 ----
<operation oneway="1" id="speakInIRCChannel"/>
! <operation id="isWatching">
<returns>
<type_spec>boolean</type_spec>
</returns>
***************
*** 846,865 ****
<parameter mode="in">
<type_spec><scoped_name>CodeSlave</scoped_name></type_spec>
<declarator>cslave</declarator>
! </paramter>
! <parameters>
</operation>
<operation id="beatCodeSlave">
<parameters>
<parameter mode="in">
! <type_spec><scoped_name>CodeSlave</scped_name</type_spec>
<declarator>cslave</declarator>
</parameter>
<parameter mode="inout">
<type_spec>beating_t</type_spec>
<declarator>severity</declarator>
! <parameter>
</parameters>
<raises>
<exception>CodeSlaveAway</exception>
--- 845,864 ----
<parameter mode="in">
<type_spec><scoped_name>CodeSlave</scoped_name></type_spec>
<declarator>cslave</declarator>
! </parameter>
! </parameters>
</operation>
<operation id="beatCodeSlave">
<parameters>
<parameter mode="in">
! <type_spec><scoped_name>CodeSlave</scoped_name></type_spec>
<declarator>cslave</declarator>
</parameter>
<parameter mode="inout">
<type_spec>beating_t</type_spec>
<declarator>severity</declarator>
! </parameter>
</parameters>
<raises>
<exception>CodeSlaveAway</exception>
***************
*** 872,885 ****
</returns>
<parameters>
<parameter mode="in">
! <type_spec><scoped_name>Hacker<scoped_name></type_spec>
<declarator>goat</declarator>
</parameter>
<parameter mode="out">
<type_spec>unsigned short</type_spec>
<declarator>tickets</declarator>
</parameter>
! <parameters>
<raises>
<exception>NoTickestAssigned</exception>
</raises>
--- 871,884 ----
</returns>
<parameters>
<parameter mode="in">
! <type_spec><scoped_name>Hacker</scoped_name></type_spec>
<declarator>goat</declarator>
</parameter>
<parameter mode="out">
<type_spec>unsigned short</type_spec>
<declarator>tickets</declarator>
</parameter>
! </parameters>
<raises>
<exception>NoTickestAssigned</exception>
</raises>
***************
*** 931,938 ****
<member>
<type_spec>string</type_spec>
<declarators>
! </declarator>why</declarator>
</declarators>
</members>
</exception>
--- 930,938 ----
<member>
<type_spec>string</type_spec>
<declarators>
! <declarator>why</declarator>
</declarators>
+ </member>
</members>
</exception>
***************
*** 941,947 ****
<type_spec><scoped_name>GNUe::DaMasta</scoped_name></type_spec>
</target>
<inverse>
! <scoped_name>GNUe::DaMasta::beats<scoped_name>
</inverse>
</relationship>
--- 941,947 ----
<type_spec><scoped_name>GNUe::DaMasta</scoped_name></type_spec>
</target>
<inverse>
! <scoped_name>GNUe::DaMasta::beats</scoped_name>
</inverse>
</relationship>
***************
*** 969,974 ****
--- 969,975 ----
<exception>CVSPermissionDenied</exception>
</raises>
</operation>
+ </interface>
<!--
This is the fun module :). It is also used to test nesting of
***************
*** 1005,1011 ****
<type_spec><scoped_name>GNUe::DaMasta</scoped_name></type_spec>
</target>
<inverse>
! <scoped_name>GNUe::DaMasta::assignsTicket<scoped_name>
</inverse>
</relationship>
</class>
--- 1006,1012 ----
<type_spec><scoped_name>GNUe::DaMasta</scoped_name></type_spec>
</target>
<inverse>
! <scoped_name>GNUe::DaMasta::assignsTicket</scoped_name>
</inverse>
</relationship>
</class>
***************
*** 1092,1098 ****
<operation id="eatPizza">
<parameters>
<parameter mode="in">
! <type_spec>pizza_t<type_spec>
<declarator>pizza</declarator>
</parameter>
</parameters>
--- 1093,1099 ----
<operation id="eatPizza">
<parameters>
<parameter mode="in">
! <type_spec>pizza_t</type_spec>
<declarator>pizza</declarator>
</parameter>
</parameters>
***************
*** 1122,1128 ****
<exception id="GoatDucked"/>
! <exception id="ExceededTroutLimit"
<members>
<member>
<type_spec>unsigned short</type_spec>
--- 1123,1129 ----
<exception id="GoatDucked"/>
! <exception id="ExceededTroutLimit">
<members>
<member>
<type_spec>unsigned short</type_spec>
***************
*** 1158,1164 ****
</attribute>
<attribute>
!
<type_spec><bag><type_spec>trout_t<type_spec></bag></type_spec>
<name>trout</name>
</attribute>
--- 1159,1165 ----
</attribute>
<attribute>
!
<type_spec><bag><type_spec>trout_t</type_spec></bag></type_spec>
<name>trout</name>
</attribute>
***************
*** 1184,1190 ****
<type_spec>unsigned short</type_spec>
<declarator>inStock</declarator>
</parameter>
! <parameters>
<raises>
<exception>ExceededTroutLimit</exception>
</raises>
--- 1185,1191 ----
<type_spec>unsigned short</type_spec>
<declarator>inStock</declarator>
</parameter>
! </parameters>
<raises>
<exception>ExceededTroutLimit</exception>
</raises>
***************
*** 1426,1434 ****
</operation>
</class>
! </odl_definition>
! </odl_specification>
! </module>
</odl_definition>
</odl_specification>
--- 1427,1435 ----
</operation>
</class>
! </odl_definition>
! </odl_specification>
! </module>
</odl_definition>
</odl_specification>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/appserver/src/_featuretest GodlParser.py O...,
Daniel E. Baumann <=