[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/appserver/src/_featuretest thekitchensink....
|
From: |
Daniel E. Baumann |
|
Subject: |
gnue/appserver/src/_featuretest thekitchensink.... |
|
Date: |
Sat, 31 Aug 2002 14:35:14 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Daniel E. Baumann <address@hidden> 02/08/31 14:35:13
Modified files:
appserver/src/_featuretest: thekitchensink.godl
thekitchensink.odl
Log message:
Add stuff.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/_featuretest/thekitchensink.godl.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/_featuretest/thekitchensink.odl.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: gnue/appserver/src/_featuretest/thekitchensink.godl
diff -c gnue/appserver/src/_featuretest/thekitchensink.godl:1.4
gnue/appserver/src/_featuretest/thekitchensink.godl:1.5
*** gnue/appserver/src/_featuretest/thekitchensink.godl:1.4 Thu Aug 15
22:51:42 2002
--- gnue/appserver/src/_featuretest/thekitchensink.godl Sat Aug 31 14:35:13 2002
***************
*** 21,30 ****
<type_spec>
<sequence><type_spec>float</type_spec></sequence>
</type_spec>
! <decalrators>
! <declarator>
! FloatSequenceType
! </declarator>
</declarators>
</typedef>
--- 21,28 ----
<type_spec>
<sequence><type_spec>float</type_spec></sequence>
</type_spec>
! <declarators>
! <declarator>FloatSequenceType</declarator>
</declarators>
</typedef>
***************
*** 44,50 ****
</declarators>
</typedef>
! <struct id="Bar">
<members>
<member>
<type_spec>string</type_spec>
--- 42,49 ----
</declarators>
</typedef>
! <struct>
! <id>Bar</id>
<members>
<member>
<type_spec>string</type_spec>
***************
*** 85,91 ****
</members>
</struct>
! <union id="Trout">
<switch>
<type_spec>boolean</type_spec>
<case>
--- 84,91 ----
</members>
</struct>
! <union>
! <id>Trout</id>
<switch>
<type_spec>boolean</type_spec>
<case>
***************
*** 105,111 ****
</switch>
</union>
! <enum id="TroutType">
<enumerator>brown</enumerator>
<enumerator>rainbow</enumerator>
<enumerator>lake</enumerator>
--- 105,112 ----
</switch>
</union>
! <enum>
! <id>TroutType</id>
<enumerator>brown</enumerator>
<enumerator>rainbow</enumerator>
<enumerator>lake</enumerator>
***************
*** 176,215 ****
</typedef>
<!-- Forward declarations -->
! <interface id="GNUe::Sadist"/>
! <class id="GNUe::Goats::Chillywilly"/>
! <const id="BIGINT">
<type_spec>
<unsigned_long>10000L</unsigned_long>
</type_spec>
</const>
! <exception id="NoModuleError">
! <parameters>
! <type_spec>string</type_spec>
! <declarators>
! <declarator>what</declarator>
! </declarators>
! <type_spec>short</type_spec>
! <declarators>
! <declarator>line</declarator>
! </declarators>
! </parameters>
</exception>
<exception id="FubarError"/>
! <interface id="KungFu">
! <operation id="Kick">
<type_spec>void</type_spec>
</operation>
! <operation id="Punch">
<type_spec>void</type_spec>
</operation>
</interface>
! <class id="Dragon">
<id>Dragon</id>
<inherits>
<interface>KungFu</interface>
--- 177,229 ----
</typedef>
<!-- Forward declarations -->
! <interface>
! <id>GNUe::Sadist</id>
! </interface>
! <class>
! <id>GNUe::Goats::Chillywilly</id>
! </interface>
! <const>
! <id>BIGINT</id>
<type_spec>
<unsigned_long>10000L</unsigned_long>
</type_spec>
</const>
! <exception>
! <id>NoModuleError</id>
! <members>
! <member>
! <type_spec>string</type_spec>
! <declarators>
! <declarator>what</declarator>
! </declarators>
! </member>
! <member>
! <type_spec>short</type_spec>
! <declarators>
! <declarator>line</declarator>
! </declarators>
! </member>
! </members>
</exception>
<exception id="FubarError"/>
! <interface>
! <id>KungFu</id>
! <operation>
<type_spec>void</type_spec>
+ <id>Kick</id>
</operation>
! <operation>
<type_spec>void</type_spec>
+ <id>Punch</id>
</operation>
</interface>
! <class>
<id>Dragon</id>
<inherits>
<interface>KungFu</interface>
***************
*** 621,646 ****
</declarators>
</typedef>
! <struct>
! <id>Foo</id>
! <members>
! <member>
! <type_spec>short</type_spec>
! <declarators>
! <declarator>fubar</declarator>
! </declarators>
! </member>
! <member>
! <type_spec>long</type_spec>
! <declarators>
! <declarator>foobar</declarator>
! </declarators>
! </member>
! <member>
! <type_spec><array><type_spec>long</type_spec></array></type_spec>
! <declarators>
! <declarator>fubarz</declarator>
! </declarators>
! </member>
! </members>
! </struct>
\ No newline at end of file
--- 635,1164 ----
</declarators>
</typedef>
! <struct>
! <id>Foo</id>
! <members>
! <member>
! <type_spec>short</type_spec>
! <declarators>
! <declarator>fubar</declarator>
! </declarators>
! </member>
! <member>
! <type_spec>long</type_spec>
! <declarators>
! <declarator>foobar</declarator>
! </declarators>
! </member>
! <member>
!
<type_spec><array><type_spec>long</type_spec></array></type_spec>
! <declarators>
! <declarator>fubarz</declarator>
! </declarators>
! </member>
! </members>
! </struct>
!
! <!--
! I am not sure I am to happy with the markup for a 'union',
! need to look into it further
! -->
! <union>
! <id>MyUnion</id>
! <switch>
! <type_spec>long</type_spec>
! <case>
! <long>1</long>
! <type_spec>string</type_spec>
! <declarator>s</declarator>
! </case>
! <default>
! <type_spec>long</type_spec>
! <declarator>x</declarator>
! </default>
! </switch>
! </union>
!
! <enum>
! <id>FooType</id>
! <enumerator>bar</enumerator>
! <enumerator>biz</enumerator>
! <enumerator>bazz</enumerator>
! </enum>
!
! <typedef>
! <type_spec><struct>Foo</struct></type_spec>
! <declarators>
! <declarator>foo</declarator>
! </declarators>
! </typedef>
!
! <typedef>
! <type_spec><union>MyUnion</union></type_spec>
! <declarators>
! <declarator>my_union</declarator>
! </declarator>
! </typedef>
!
! <typedef>
! <type_spec><enum>FooType</enum></type_spec>
! <declarators>
! <declarator>foo_type</declarator>
! </declarators>
! </typedef>
!
! <typedef>
! <type_spec>
! <dictionary>
! <key>
! <type_spec>float</type_spec>
! </key>
! <value>
! <type_spec>float</type_spec>
! </value>
! </dictionary>
! </type_spec>
! <declarators>
! <declarator>Dictionary</declarator>
! </declarators>
! </typedef>
!
! <typedef>
! <type_spec><set><type_spec>float</type_spec></set></type_spec>
! <declarators>
! <declarator>Set</declarator>
! </declarators>
! </typedef>
!
! <typedef>
! <type_spec><list><type_spec>float</type_spec></list></type_spec>
! <declarators>
! <declarator>Set</declarator>
! </declarators>
! </typedef>
!
! <typedef>
! <type_spec><bag><type_spec>float</type_spec></bag></type_spec>
! <declarators>
! <declarator>Bag</declarator>
! </declarators>
! </typedef>
!
! <!-- Forward declarations -->
! <interface>
! <id>CodeSlave</id>
! </interface>
! <class>
! <id>Goats::Goat</id>
! </class>
!
! <const>
! <id>MADGOATS</id>
! <type_spec>
! <boolean>TRUE</boolean>
! </type_spec>
! </const>
!
! <exception>
! <id>FooError</id>
! </exception>
!
! <exception>
! <id>BarError</id>
! <members>
! <member>
! <type_spec>string</type_spec>
! <declarators>
! <declarator>biz</declarator>
! </declarators>
! </member>
! <member>
! <type_spec>char</type_spec>
! <declarators>
! <declarator>bar</declarator>
! </declarators>
! </member>
! <member>
! <type_spec>float</type_spec>
! <declarators>
! <declarator>baz</declarator>
! </declarators>
! </member>
! </members>
! </exception>
!
! <interface>
! <id>Sadist</id>
! <operation>
! <type_spec>void</type_spec>
! <id>torture</id>
! </operation>
! </interface>
!
! <interface>
! <id>Masochist</id>
! <operation>
! <type_spec>void</type_spec>
! <id>suffer</id>
! </operation>
! </interface>
!
! <interface>
! <id>DaMasta</id>
! <inherits>
! <interface>Sadist</interface>
! </inherits>
!
! <enum>
! <id>BeatingType</id>
! <enumeration>mild</enumeration>
! <enumeration>profuse</enumeration>
! </enum>
!
! <typedef>
! <type_spec><enum>BeatingType</enum></type_spec>
! <declarators>
! <declarator>beating_t</declarator>
! </declarators>
! </typedef>
!
! <const>
! <id>FAVCOLOR</id>
! <type_spec><string>red</string></type_spec>
! </const>
!
! <exception>
! <id>CodeSlaveAway</id>
! </exception>
!
! <exception>
! <id>NoTicketsAssigned</id>
! </exception>
!
! <attribute readonly="1">
! <type_sepc>string</type_spec>
! <name>favoriteColor</name>
! </attribute>
!
! <attribute>
! <type_spec>unsigned short</type_spec>
! <name>bugReports</name>
! </attribute>
!
! <attribute>
! <type_spec>beating_t</type_spec>
! <name>beating</name>
! </attribute>
!
! <relationship>
! <target>
! <type_spec><set>CodeSlave</set></type_spec>
! </target>
! <id>beats</id>
! <inverse>
! <id>CodeSlave::isBeaten</id>
! </inverse>
! </relationship>
!
! <relationship>
! <target>
! <type_spec><scoped_name>Hacker</scoped_name></type_spec>
! </target>
! <id>assignsTicket</id>
! <inverse>
! <id>Hacker::isAssignedTicketBy</id>
! </inverse>
! </relationship>
!
! <operation oneway="1">
! <type_spec>void</type_spec>
! <id>speakInIRCChannel</id>
! </operation>
!
! <operaion>
! <type_spec>boolean</type_spec>
! <id>isWatching</id>
! <parameters>
! <parameter>
! <attribute>in</attribute>
! <type_spec><scoped_name>CodeSlave</scoped_name></type_spec>
! <declarator>cslave</declarator>
! </paramter>
! <parameters>
! </operation>
!
! <operation>
! <type_spec>void</type_spec>
! <id>beatCodeSlave</id>
! <parameters>
! <parameter>
! <attribute>in</attribute>
! <type_spec><scoped_name>CodeSlave</scped_name</type_spec>
! <declarator>cslave</declarator>
! </parameter>
! <parameter>
! <attribute>inout</attribute>
! <type_spec>beating_t</type_spec>
! <declarator>severity</declarator>
! <parameter>
! </parameters>
! <raises>
! <scoped_name>CodeSlaveAway</scoped_name>
! </raises>
! </operation>
!
! <operation>
! <type_spec>boolean</type_spec>
! <id>getTickets</id>
! <parameters>
! <parameter>
! <attribute>in</attribute>
! <type_spec><scoped_name>Hacker<scoped_name></type_spec>
! <declarator>goat</declarator>
! </parameter>
! <parameter>
! <attribute>out</attribute>
! <type_spec>unsigned short</type_spec>
! <declarator>tickets</declarator>
! </parameter>
! <parameters>
! <raises>
! <scoped_name>NoTickestAssigned</scoped_name>
! </raises>
! </operation>
!
! </interface>
!
! <interface>
! <id>CodeSlave</id>
! <inherits>
! <interface>Masochist</interface>
! </inherits>
!
! <enum>
! <id>HackType</id>
! <enumeration>common</enumeration>
! <enumeration>forms</enumeration>
! <enumeration>appserver</enumeration>
! <enumeration>designer</enumeration>
! <enumeration>reports</enumeration>
! <enumeration>navigator</enumeration>
! <enumeration>phpforms</enumeration>
! </enum>
!
! <typedef>
! <type_spec><enum>HackType</enum></type_spec>
! <declarators>
! <declarator>hack_t</declarator>
! </declarators>
! </typedef>
!
! <exception>
! <id>WhoSaidYouCouldStopCoding</id>
! <members>
! <member>
! <type_spec>string</type_spec>
! <declarators>
! <declarator>cslave_name</declarator>
! </declarators>
! </member>
! <member>
! <type_spec>boolean</type_spec>
! <declarators>
! <declarator>beating</declarator>
! </declarators>
! </member>
! </members>
! </exception>
!
! <exception>
! <id>CVSPermissionDenied</id>
! <members>
! <member>
! <type_spec>string</type_spec>
! <declarators>
! </declarator>why</declarator>
! </declarators>
! </members>
! </exception>
!
! <relationship>
! <target>
! <type_spec>GNUe::DaMasta</type_spec>
! </target>
! <id>isBeaten</id>
! <inverse>
! <id>GNUe::DaMasta::beats</id>
! </inverse>
! </relationship>
!
! <operation>
! <type_spec>void</type_spec>
! <id>stopCoding</id>
! <raises>
! <scoped_name>WhoSaidYouCouldStopCoding</scoped_name>
! </raises>
! </operation>
!
! <operation>
! <type_spec>boolean</type_spec>
! <id>commitCode</id>
! <parameters>
! <parameter>
! <attribute>in</attribute>
! <type_spec>string</type_spec>
! <declarator>code</declarator>
! </parameter>
! <parameter>
! <attribute>in</attribute>
! <type_spec>hack_t</type_spec>
! <declarator>hackingOn</declarator>
! </parameter>
! </parameters>
! <raises>
! <scoped_name>CVSPermissionDenied</scoped_name>
! </raises>
! </operation>
!
! <module>
! <id>Goats</id>
! <odl_specification>
! <odl_definition>
!
! <class>
! <id>Goat</id>
! <inherits>
! <interface>GNUe::CodeSlave</interface>
! </inherits>
!
! <attribute>
! <type_spec>boolean</type_spec>
! <name>madGoatRaped</name>
! </attribute>
!
! <attribute>
! <type_spec>string</type_spec>
! <name>name</name>
! </attribute>
!
! <attribute>
! <type_spec>boolean</type_spec>
! <name>FSFCopyrightAssignment</name>
! </attribute>
!
! <relationship>
! <target>
! <type_spec>GNUe::DaMasta</type_spec>
! </target>
! <id>isAssignedTicketBy</id>
! <inverse>
! <id>GNUe::DaMasta::assignsTicket</id>
! </inverse>
! </relationship>
! </class>
!
! <class>
! <id>Derek</id>
! <extends>
! <scoped_name>Goat</scoped_name>
! </extends>
! <inherits>
! <scoped_name>GNUe::DaMasta</scoped_name>
! </inherits>
! <extent>goats</extent>
!
! <exception>
! <id>BurnRoofOfMouth</id>
! </exception>
!
! <exception>
! <id>NeedsReheating</id>
! </exception>
!
! <exception>
! <id>OutofTopping</id>
! <members>
! <member>
! <type_spec>string</type_spec>
! <declarators>
! <declarator>topping</declarator>
! </declarators>
! </member>
! </members>
! </exception>
!
! <struct>
! <id>PizzaType</id>
! <members>
! <member>
! <type_spec>string</type_spec>
! <declarators>
! <declarator>kind</declarator>
! </declarators>
! </member>
! <member>
!
<type_spec><bag><type_spec>string</type_spec></bag></type_spec>
! <declarators>
! <declarator>toppings</declarator>
! </declarators>
! </member>
! </members>
! </struct>
!
! <typedef>
! <type_spec><struct>PizzaType</struct></type_spec>
! <declarators>
! <declarator>pizza_t</declarator>
! </declarators>
! </typedef>
!
! <attribute>
! <type_spec>boolean</type_spec>
! <name>orderPizza</name>
! </attribute>
!
! <attribute>
! <type_spec>float</type_spec>
! <name>temperature</name>
! </attribute>
!
! <attribute>
!
<type_spec><set><type_spec>pizza_t</type_spec></set></type_spec>
! <name>pizzas</name>
! </attribute>
!
! <operation>
! <type_spec>boolean</type_spec>
! <id>orderPizza</id>
! <parameters>
! <parameter>
! <attribute>in</attribute>
! <type_spec><set>pizza_t</set></type_spec>
! <declarator>pizzaPies</declarator>
! </parameter>
! </parameters>
! <raises>
! <scoped_name>OutofTopping</scoped_name>
! </raises>
! </operation>
!
! <operation>
! <type_spec>void</type_spec>
! <id>eatPizza</id>
! <parameters>
! <parameter>
! <attribute>in</attribute>
! <type_spec>pizza_t<type_spec>
! <declarator>pizza</declarator>
! </parameter>
! </parameters>
! <raises>
! <scoped_name>BurnRoofofMouth</scoped_name>
! <scoped_name>NeedsReheating</scoped_name>
! </raises>
! </operation>
! </class>
!
! <class>
! <id>Chillywilly</id>
!
\ No newline at end of file
Index: gnue/appserver/src/_featuretest/thekitchensink.odl
diff -c gnue/appserver/src/_featuretest/thekitchensink.odl:1.5
gnue/appserver/src/_featuretest/thekitchensink.odl:1.6
*** gnue/appserver/src/_featuretest/thekitchensink.odl:1.5 Tue Jul 23
07:09:34 2002
--- gnue/appserver/src/_featuretest/thekitchensink.odl Sat Aug 31 14:35:13 2002
***************
*** 116,121 ****
--- 116,122 ----
typedef sequence<boolean> BooleanSequence;
typedef sequence<octet> OctetSequence;
typedef sequence<date> DateSequence;
+
typedef sequence<time> TimeSequence;
typedef sequence<interval> IntervalSequence;
typedef sequence<timestamp> TimestampSequence;
***************
*** 233,239 ****
relationship GNUe::DaMasta isBeaten inverse GNUe::DaMasta::beats;
void stopCoding() raises(WhoSaidYouCouldStopCoding);
! boolean commitCode(in string code, in hack_t)
raises(CVSPermissionDenied);
};
// This is the fun module :). It is also used to test nesting of
--- 234,240 ----
relationship GNUe::DaMasta isBeaten inverse GNUe::DaMasta::beats;
void stopCoding() raises(WhoSaidYouCouldStopCoding);
! boolean commitCode(in string code, in hack_t hackingOn)
raises(CVSPermissionDenied);
};
// This is the fun module :). It is also used to test nesting of
***************
*** 243,255 ****
{
class Goat: GNUe::CodeSlave
{
! attribute boolean madGoatRaped = GNUe::MADGOATS;
attribute string name;
attribute boolean FSFCopyrightAssignment;
relationship GNUe::DaMasta isAssignedTicketBy
! inverse GNUe::DaMasta assignsTicket;
};
--- 244,256 ----
{
class Goat: GNUe::CodeSlave
{
! attribute boolean madGoatRaped;
attribute string name;
attribute boolean FSFCopyrightAssignment;
relationship GNUe::DaMasta isAssignedTicketBy
! inverse GNUe::DaMasta::assignsTicket;
};
***************
*** 257,263 ****
( extent goats)
{
exception BurnRoofofMouth{};
! exception NeedsReheating{};x
exception OutofTopping{string topping;};
struct PizzaType
--- 258,264 ----
( extent goats)
{
exception BurnRoofofMouth{};
! exception NeedsReheating{};
exception OutofTopping{string topping;};
struct PizzaType