Skip to content

Commit

Permalink
HEAD:(zeroc-ice/ice@603000d9b7) Swap the Order that the Parser Create…
Browse files Browse the repository at this point in the history 
…s 'Def' and 'Decl' Types (zeroc-ice/ice#3359)
  • Loading branch information
@InsertCreativityHere
InsertCreativityHere authored and temp committed Jan 15, 2025
1 parent d837fdc commit 000379a
Show file tree
Hide file tree
Showing 1,278 changed files with 22,314 additions and 8,612 deletions.
41 changes: 41 additions & 0 deletions slice2php/cpp/src/DataStorm/Contract.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,12 @@ public function __toString(): string
array('criteria', $Ice__t_ByteSeq)));
}

namespace DataStormContract
{
global $DataStormContract__t_ElementConfig;
$DataStormContract__t_ElementConfig = IcePHP_declareClass('::DataStormContract::ElementConfig');
}

namespace DataStormContract
{
global $DataStormContract__t_ElementConfig;
Expand Down Expand Up @@ -543,6 +549,13 @@ public function __toString(): string
}
}

namespace DataStormContract
{
global $DataStormContract__t_Session;
global $DataStormContract__t_SessionPrx;
$DataStormContract__t_SessionPrx = IcePHP_declareProxy('::DataStormContract::Session');
}

namespace DataStormContract
{
global $DataStormContract__t_Session;
Expand Down Expand Up @@ -596,6 +609,13 @@ public static function ice_staticId()
IcePHP_defineOperation($DataStormContract__t_SessionPrx, 'disconnected', 0, -1, null, null, null, null);
}

namespace DataStormContract
{
global $DataStormContract__t_PublisherSession;
global $DataStormContract__t_PublisherSessionPrx;
$DataStormContract__t_PublisherSessionPrx = IcePHP_declareProxy('::DataStormContract::PublisherSession');
}

namespace DataStormContract
{
global $DataStormContract__t_PublisherSession;
Expand Down Expand Up @@ -628,6 +648,13 @@ public static function ice_staticId()
$DataStormContract__t_PublisherSessionPrx = IcePHP_defineProxy('::DataStormContract::PublisherSession', $Ice__t_ObjectPrx, array($DataStormContract__t_SessionPrx));
}

namespace DataStormContract
{
global $DataStormContract__t_SubscriberSession;
global $DataStormContract__t_SubscriberSessionPrx;
$DataStormContract__t_SubscriberSessionPrx = IcePHP_declareProxy('::DataStormContract::SubscriberSession');
}

namespace DataStormContract
{
global $DataStormContract__t_SubscriberSession;
Expand Down Expand Up @@ -664,6 +691,13 @@ public static function ice_staticId()
IcePHP_defineOperation($DataStormContract__t_SubscriberSessionPrx, 's', 0, -1, array(array($IcePHP__t_long), array($IcePHP__t_long), array($DataStormContract__t_DataSample)), null, null, null);
}

namespace DataStormContract
{
global $DataStormContract__t_Node;
global $DataStormContract__t_NodePrx;
$DataStormContract__t_NodePrx = IcePHP_declareProxy('::DataStormContract::Node');
}

namespace DataStormContract
{
global $DataStormContract__t_Node;
Expand Down Expand Up @@ -704,6 +738,13 @@ public static function ice_staticId()
IcePHP_defineOperation($DataStormContract__t_NodePrx, 'confirmCreateSession', 0, -1, array(array($DataStormContract__t_NodePrx), array($DataStormContract__t_PublisherSessionPrx)), null, null, null);
}

namespace DataStormContract
{
global $DataStormContract__t_Lookup;
global $DataStormContract__t_LookupPrx;
$DataStormContract__t_LookupPrx = IcePHP_declareProxy('::DataStormContract::Lookup');
}

namespace DataStormContract
{
global $DataStormContract__t_Lookup;
Expand Down
93 changes: 87 additions & 6 deletions slice2php/cpp/src/IceGrid/Internal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
require_once 'IceGrid/Registry.php';
}

namespace IceGrid
{
global $IceGrid__t_InternalDbEnvDescriptor;
$IceGrid__t_InternalDbEnvDescriptor = IcePHP_declareClass('::IceGrid::InternalDbEnvDescriptor');
}

namespace IceGrid
{
global $IceGrid__t_InternalDbEnvDescriptor;
Expand Down Expand Up @@ -75,6 +81,12 @@ public function __toString(): string
}
}

namespace IceGrid
{
global $IceGrid__t_InternalAdapterDescriptor;
$IceGrid__t_InternalAdapterDescriptor = IcePHP_declareClass('::IceGrid::InternalAdapterDescriptor');
}

namespace IceGrid
{
global $IceGrid__t_InternalAdapterDescriptor;
Expand Down Expand Up @@ -137,6 +149,12 @@ public function __toString(): string
}
}

namespace IceGrid
{
global $IceGrid__t_InternalServerDescriptor;
$IceGrid__t_InternalServerDescriptor = IcePHP_declareClass('::IceGrid::InternalServerDescriptor');
}

namespace IceGrid
{
global $IceGrid__t_InternalServerDescriptor;
Expand Down Expand Up @@ -202,8 +220,6 @@ public function __toString(): string
public $services;
}

$IceGrid__t_InternalServerDescriptor = IcePHP_declareClass('::IceGrid::InternalServerDescriptor');

global $Ice__t_Value;
global $IcePHP__t_string;
global $IcePHP__t_int;
Expand Down Expand Up @@ -278,6 +294,13 @@ public function __toString(): string
array('activatable', $IcePHP__t_bool, false, 0)));
}

namespace IceGrid
{
global $IceGrid__t_Adapter;
global $IceGrid__t_AdapterPrx;
$IceGrid__t_AdapterPrx = IcePHP_declareProxy('::IceGrid::Adapter');
}

namespace IceGrid
{
global $IceGrid__t_Adapter;
Expand Down Expand Up @@ -351,6 +374,13 @@ public function __toString(): string
}
}

namespace IceGrid
{
global $IceGrid__t_FileReader;
global $IceGrid__t_FileReaderPrx;
$IceGrid__t_FileReaderPrx = IcePHP_declareProxy('::IceGrid::FileReader');
}

namespace IceGrid
{
global $IceGrid__t_FileReader;
Expand Down Expand Up @@ -391,6 +421,13 @@ public static function ice_staticId()
IcePHP_defineOperation($IceGrid__t_FileReaderPrx, 'read', 2, -1, array(array($IcePHP__t_string), array($IcePHP__t_long), array($IcePHP__t_int)), array(array($IcePHP__t_long), array($Ice__t_StringSeq)), array($IcePHP__t_bool), array($IceGrid__t_FileNotAvailableException));
}

namespace IceGrid
{
global $IceGrid__t_Server;
global $IceGrid__t_ServerPrx;
$IceGrid__t_ServerPrx = IcePHP_declareProxy('::IceGrid::Server');
}

namespace IceGrid
{
global $IceGrid__t_Server;
Expand Down Expand Up @@ -444,10 +481,7 @@ public static function ice_staticId()
{
global $IceGrid__t_InternalRegistry;
global $IceGrid__t_InternalRegistryPrx;
if(!isset($IceGrid__t_InternalRegistry))
{
$IceGrid__t_InternalRegistryPrx = IcePHP_declareProxy('::IceGrid::InternalRegistry');
}
$IceGrid__t_InternalRegistryPrx = IcePHP_declareProxy('::IceGrid::InternalRegistry');
}

namespace IceGrid
Expand All @@ -461,6 +495,13 @@ public static function ice_staticId()
}
}

namespace IceGrid
{
global $IceGrid__t_ReplicaObserver;
global $IceGrid__t_ReplicaObserverPrx;
$IceGrid__t_ReplicaObserverPrx = IcePHP_declareProxy('::IceGrid::ReplicaObserver');
}

namespace IceGrid
{
global $IceGrid__t_ReplicaObserver;
Expand Down Expand Up @@ -499,6 +540,13 @@ public static function ice_staticId()
IcePHP_defineOperation($IceGrid__t_ReplicaObserverPrx, 'replicaRemoved', 0, -1, array(array($IceGrid__t_InternalRegistryPrx)), null, null, null);
}

namespace IceGrid
{
global $IceGrid__t_Node;
global $IceGrid__t_NodePrx;
$IceGrid__t_NodePrx = IcePHP_declareProxy('::IceGrid::Node');
}

namespace IceGrid
{
global $IceGrid__t_Node;
Expand Down Expand Up @@ -580,6 +628,13 @@ public function __toString(): string
$IceGrid__t_NodeActiveException = IcePHP_defineException('::IceGrid::NodeActiveException', '\\IceGrid\\NodeActiveException', null, null);
}

namespace IceGrid
{
global $IceGrid__t_NodeSession;
global $IceGrid__t_NodeSessionPrx;
$IceGrid__t_NodeSessionPrx = IcePHP_declareProxy('::IceGrid::NodeSession');
}

namespace IceGrid
{
global $IceGrid__t_NodeSession;
Expand Down Expand Up @@ -662,6 +717,13 @@ class TopicName
$IceGrid__t_TopicName = IcePHP_defineEnum('::IceGrid::TopicName', array('RegistryObserver', 0, 'NodeObserver', 1, 'ApplicationObserver', 2, 'AdapterObserver', 3, 'ObjectObserver', 4));
}

namespace IceGrid
{
global $IceGrid__t_DatabaseObserver;
global $IceGrid__t_DatabaseObserverPrx;
$IceGrid__t_DatabaseObserverPrx = IcePHP_declareProxy('::IceGrid::DatabaseObserver');
}

namespace IceGrid
{
global $IceGrid__t_DatabaseObserver;
Expand Down Expand Up @@ -706,6 +768,13 @@ public static function ice_staticId()
}
}

namespace IceGrid
{
global $IceGrid__t_ReplicaSession;
global $IceGrid__t_ReplicaSessionPrx;
$IceGrid__t_ReplicaSessionPrx = IcePHP_declareProxy('::IceGrid::ReplicaSession');
}

namespace IceGrid
{
global $IceGrid__t_ReplicaSession;
Expand Down Expand Up @@ -755,6 +824,12 @@ public static function ice_staticId()
IcePHP_defineOperation($IceGrid__t_ReplicaSessionPrx, 'destroy', 0, -1, null, null, null, null);
}

namespace IceGrid
{
global $IceGrid__t_InternalNodeInfo;
$IceGrid__t_InternalNodeInfo = IcePHP_declareClass('::IceGrid::InternalNodeInfo');
}

namespace IceGrid
{
global $IceGrid__t_InternalNodeInfo;
Expand Down Expand Up @@ -815,6 +890,12 @@ public function __toString(): string
array('iceSoVersion', $IcePHP__t_string, true, 1)));
}

namespace IceGrid
{
global $IceGrid__t_InternalReplicaInfo;
$IceGrid__t_InternalReplicaInfo = IcePHP_declareClass('::IceGrid::InternalReplicaInfo');
}

namespace IceGrid
{
global $IceGrid__t_InternalReplicaInfo;
Expand Down
19 changes: 15 additions & 4 deletions slice2php/cpp/src/IceStorm/Election.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ public function __toString(): string
array('reason', $IcePHP__t_string, false, 0)));
}

namespace IceStormElection
{
global $IceStormElection__t_ReplicaObserver;
global $IceStormElection__t_ReplicaObserverPrx;
$IceStormElection__t_ReplicaObserverPrx = IcePHP_declareProxy('::IceStormElection::ReplicaObserver');
}

namespace IceStormElection
{
global $IceStormElection__t_ReplicaObserver;
Expand Down Expand Up @@ -129,6 +136,13 @@ public static function ice_staticId()
IcePHP_defineOperation($IceStormElection__t_ReplicaObserverPrx, 'removeSubscriber', 0, -1, array(array($IceStormElection__t_LogUpdate), array($IcePHP__t_string), array($Ice__t_IdentitySeq)), null, null, array($IceStormElection__t_ObserverInconsistencyException));
}

namespace IceStormElection
{
global $IceStormElection__t_TopicManagerSync;
global $IceStormElection__t_TopicManagerSyncPrx;
$IceStormElection__t_TopicManagerSyncPrx = IcePHP_declareProxy('::IceStormElection::TopicManagerSync');
}

namespace IceStormElection
{
global $IceStormElection__t_TopicManagerSync;
Expand Down Expand Up @@ -183,10 +197,7 @@ class NodeState
{
global $IceStormElection__t_Node;
global $IceStormElection__t_NodePrx;
if(!isset($IceStormElection__t_Node))
{
$IceStormElection__t_NodePrx = IcePHP_declareProxy('::IceStormElection::Node');
}
$IceStormElection__t_NodePrx = IcePHP_declareProxy('::IceStormElection::Node');
}

namespace IceStormElection
Expand Down
21 changes: 21 additions & 0 deletions slice2php/cpp/src/IceStorm/IceStormInternal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@ public function __toString(): string
}
}

namespace IceStorm
{
global $IceStorm__t_TopicLink;
global $IceStorm__t_TopicLinkPrx;
$IceStorm__t_TopicLinkPrx = IcePHP_declareProxy('::IceStorm::TopicLink');
}

namespace IceStorm
{
global $IceStorm__t_TopicLink;
Expand Down Expand Up @@ -125,6 +132,13 @@ public function __toString(): string
$IceStorm__t_ReapWouldBlock = IcePHP_defineException('::IceStorm::ReapWouldBlock', '\\IceStorm\\ReapWouldBlock', null, null);
}

namespace IceStorm
{
global $IceStorm__t_TopicInternal;
global $IceStorm__t_TopicInternalPrx;
$IceStorm__t_TopicInternalPrx = IcePHP_declareProxy('::IceStorm::TopicInternal');
}

namespace IceStorm
{
global $IceStorm__t_TopicInternal;
Expand Down Expand Up @@ -162,6 +176,13 @@ public static function ice_staticId()
IcePHP_defineOperation($IceStorm__t_TopicInternalPrx, 'reap', 0, -1, array(array($Ice__t_IdentitySeq)), null, null, array($IceStorm__t_ReapWouldBlock));
}

namespace IceStorm
{
global $IceStorm__t_TopicManagerInternal;
global $IceStorm__t_TopicManagerInternalPrx;
$IceStorm__t_TopicManagerInternalPrx = IcePHP_declareProxy('::IceStorm::TopicManagerInternal');
}

namespace IceStorm
{
global $IceStorm__t_TopicManagerInternal;
Expand Down
6 changes: 6 additions & 0 deletions slice2php/cpp/test/DataStorm/api/Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ public function __toString(): string
array('value', $IcePHP__t_int)));
}

namespace Test
{
global $Test__t_ClassKey;
$Test__t_ClassKey = IcePHP_declareClass('::Test::ClassKey');
}

namespace Test
{
global $Test__t_ClassKey;
Expand Down
Loading

0 comments on commit 000379a

Please sign in to comment.