summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Slice/Grammar.y79
-rw-r--r--cpp/src/Slice/Parser.cpp52
2 files changed, 81 insertions, 50 deletions
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 42733a7ca75..ba572b1d274 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -266,7 +266,7 @@ exception_id
{
StringTokPtr ident = StringTokPtr::dynamicCast($2);
unit->error("keyword `" + ident->v + "' cannot be used as exception name");
- $$ = $2;
+ $$ = $2; // Dummy
}
;
@@ -378,7 +378,7 @@ struct_id
{
StringTokPtr ident = StringTokPtr::dynamicCast($2);
unit->error("keyword `" + ident->v + "' cannot be used as struct name");
- $$ = $2;
+ $$ = $2; // Dummy
}
;
@@ -388,7 +388,7 @@ struct_decl
: local_qualifier struct_id
{
unit->error("structs cannot be forward declared");
- $$ = 0;
+ $$ = 0; // Dummy
}
;
@@ -423,7 +423,7 @@ struct_def
assert(st);
if(st->dataMembers().empty())
{
- unit->error("struct `" + st->name() + "' must have at least one member");
+ unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy
}
}
;
@@ -469,7 +469,7 @@ class_id
{
StringTokPtr ident = StringTokPtr::dynamicCast($2);
unit->error("keyword `" + ident->v + "' cannot be used as class name");
- $$ = $2;
+ $$ = $2; // Dummy
}
;
@@ -639,17 +639,17 @@ data_member
ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
if(cl)
{
- $$ = cl->createDataMember(name, type);
+ $$ = cl->createDataMember(name, type); // Dummy
}
StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
if(st)
{
- $$ = st->createDataMember(name, type);
+ $$ = st->createDataMember(name, type); // Dummy
}
ExceptionPtr ex = ExceptionPtr::dynamicCast(unit->currentContainer());
if(ex)
{
- $$ = ex->createDataMember(name, type);
+ $$ = ex->createDataMember(name, type); // Dummy
}
assert($$);
unit->error("keyword `" + name + "' cannot be used as data member name");
@@ -660,17 +660,17 @@ data_member
ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
if(cl)
{
- $$ = cl->createDataMember(IceUtil::generateUUID(), type);
+ $$ = cl->createDataMember(IceUtil::generateUUID(), type); // Dummy
}
StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
if(st)
{
- $$ = st->createDataMember(IceUtil::generateUUID(), type);
+ $$ = st->createDataMember(IceUtil::generateUUID(), type); // Dummy
}
ExceptionPtr ex = ExceptionPtr::dynamicCast(unit->currentContainer());
if(ex)
{
- $$ = ex->createDataMember(IceUtil::generateUUID(), type);
+ $$ = ex->createDataMember(IceUtil::generateUUID(), type); // Dummy
}
assert($$);
unit->error("missing data member name");
@@ -791,7 +791,7 @@ operation_preamble
{
unit->pushContainer(op);
unit->error("keyword `" + name + "' cannot be used as operation name");
- $$ = op;
+ $$ = op; // Dummy
}
else
{
@@ -815,7 +815,7 @@ operation_preamble
{
unit->pushContainer(op);
unit->error("keyword `" + name + "' cannot be used as operation name");
- $$ = op;
+ $$ = op; // Dummy
}
else
{
@@ -839,7 +839,7 @@ operation_preamble
{
unit->pushContainer(op);
unit->error("keyword `" + name + "' cannot be used as operation name");
- $$ = op;
+ $$ = op; // Dummy
}
else
{
@@ -893,7 +893,7 @@ throws
assert(el);
if(op)
{
- op->setExceptionList(el->v);
+ op->setExceptionList(el->v); // Dummy
}
}
;
@@ -916,7 +916,7 @@ interface_id
{
StringTokPtr ident = StringTokPtr::dynamicCast($2);
unit->error("keyword `" + ident->v + "' cannot be used as interface name");
- $$ = $2;
+ $$ = $2; // Dummy
}
;
@@ -1021,7 +1021,7 @@ interface_list
string msg = "`";
msg += scoped->v;
msg += "' is not an interface";
- unit->error(msg);
+ unit->error(msg); // $$ is a dummy
}
else
{
@@ -1031,7 +1031,7 @@ interface_list
string msg = "`";
msg += scoped->v;
msg += "' has been declared but not defined";
- unit->error(msg);
+ unit->error(msg); // $$ is a dummy
}
else
{
@@ -1045,7 +1045,7 @@ interface_list
| ICE_OBJECT
{
unit->error("illegal inheritance from type Object");
- $$ = new ClassListTok;
+ $$ = new ClassListTok; // Dummy
}
;
@@ -1121,7 +1121,7 @@ exception
ExceptionPtr exception = cont->lookupException(scoped->v);
if(!exception)
{
- exception = cont->createException(IceUtil::generateUUID(), 0, false);
+ exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
}
cont->checkIntroduced(scoped->v, exception);
$$ = exception;
@@ -1130,7 +1130,7 @@ exception
{
StringTokPtr ident = StringTokPtr::dynamicCast($1);
unit->error("keyword `" + ident->v + "' cannot be used as exception name");
- $$ = unit->currentContainer()->createException(IceUtil::generateUUID(), 0, false);
+ $$ = unit->currentContainer()->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
}
;
@@ -1153,7 +1153,7 @@ sequence_def
StringListTokPtr metaData = StringListTokPtr::dynamicCast($4);
TypePtr type = TypePtr::dynamicCast($5);
ContainerPtr cont = unit->currentContainer();
- $$ = cont->createSequence(ident->v, type, metaData->v, local->v);
+ $$ = cont->createSequence(ident->v, type, metaData->v, local->v); // Dummy
unit->error("keyword `" + ident->v + "' cannot be used as sequence name");
}
;
@@ -1181,7 +1181,7 @@ dictionary_def
StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast($7);
TypePtr valueType = TypePtr::dynamicCast($8);
ContainerPtr cont = unit->currentContainer();
- $$ = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v);
+ $$ = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v); // Dummy
unit->error("keyword `" + ident->v + "' cannot be used as dictionary name");
}
;
@@ -1197,7 +1197,7 @@ enum_id
{
StringTokPtr ident = StringTokPtr::dynamicCast($2);
unit->error("keyword `" + ident->v + "' cannot be used as enumeration name");
- $$ = $2;
+ $$ = $2; // Dummy
}
;
@@ -1223,10 +1223,21 @@ enum_def
{
unit->error("enum `" + en->name() + "' must have at least one enumerator");
}
- en->setEnumerators(enumerators->v);
+ en->setEnumerators(enumerators->v); // Dummy
}
$$ = $3;
}
+|
+local_qualifier ICE_ENUM '{' enumerator_list '}'
+{
+ unit->error("missing enumeration name");
+ BoolTokPtr local = BoolTokPtr::dynamicCast($1);
+ ContainerPtr cont = unit->currentContainer();
+ EnumPtr en = cont->createEnum(IceUtil::generateUUID(), local->v, Dummy); // Dummy
+ EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast($4);
+ en->setEnumerators(enumerators->v); // Dummy
+ $$ = en;
+}
;
// ----------------------------------------------------------------------
@@ -1262,13 +1273,13 @@ enumerator
{
StringTokPtr ident = StringTokPtr::dynamicCast($1);
unit->error("keyword `" + ident->v + "' cannot be used as enumerator");
- EnumeratorListTokPtr ens = new EnumeratorListTok;
+ EnumeratorListTokPtr ens = new EnumeratorListTok; // Dummy
$$ = ens;
}
|
{
EnumeratorListTokPtr ens = new EnumeratorListTok;
- $$ = ens;
+ $$ = ens; // Dummy
}
;
@@ -1339,7 +1350,7 @@ parameters
OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
if(op)
{
- op->createParamDecl(ident->v, type, isOutParam->v);
+ op->createParamDecl(ident->v, type, isOutParam->v); // Dummy
unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
}
}
@@ -1351,7 +1362,7 @@ parameters
OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
if(op)
{
- op->createParamDecl(ident->v, type, isOutParam->v);
+ op->createParamDecl(ident->v, type, isOutParam->v); // Dummy
unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
}
}
@@ -1362,7 +1373,7 @@ parameters
OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
if(op)
{
- op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v);
+ op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v); // Dummy
unit->error("missing parameter name");
}
}
@@ -1373,7 +1384,7 @@ parameters
OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
if(op)
{
- op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v);
+ op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v); // Dummy
unit->error("missing parameter name");
}
}
@@ -1505,7 +1516,7 @@ type
cont->checkIntroduced(scoped->v);
if(cl->isLocal())
{
- unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'");
+ unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy
}
*p = new Proxy(cl);
}
@@ -1613,7 +1624,7 @@ const_initializer
msg += "n";
}
msg += " " + kindOf;
- unit->error(msg);
+ unit->error(msg); // $$ is dummy
}
unit->currentContainer()->checkIntroduced(scoped->v, enumerator);
basestring->v = pair<SyntaxTreeBasePtr,string>(enumerator, scoped->v);
@@ -1664,7 +1675,7 @@ const_def
SyntaxTreeBaseStringTokPtr value = SyntaxTreeBaseStringTokPtr::dynamicCast($5);
unit->error("missing constant name");
$$ = unit->currentContainer()->createConst(IceUtil::generateUUID(), const_type, metaData->v, value->v.first,
- value->v.second);
+ value->v.second, Dummy); // Dummy
}
;
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 45ae1635d78..02e9a1d113b 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -695,7 +695,7 @@ Slice::Container::createClassDecl(const string& name, bool intf, bool local)
}
ExceptionPtr
-Slice::Container::createException(const string& name, const ExceptionPtr& base, bool local)
+Slice::Container::createException(const string& name, const ExceptionPtr& base, bool local, NodeType nt)
{
checkPrefix(name);
@@ -727,7 +727,10 @@ Slice::Container::createException(const string& name, const ExceptionPtr& base,
nameIsLegal(name, "exception"); // Don't return here -- we create the exception anyway
- checkForGlobalDef(name, "exception"); // Don't return here -- we create the exception anyway
+ if(nt == Real)
+ {
+ checkForGlobalDef(name, "exception"); // Don't return here -- we create the exception anyway
+ }
//
// If this definition is non-local, base cannot be local.
@@ -743,7 +746,7 @@ Slice::Container::createException(const string& name, const ExceptionPtr& base,
}
StructPtr
-Slice::Container::createStruct(const string& name, bool local)
+Slice::Container::createStruct(const string& name, bool local, NodeType nt)
{
checkPrefix(name);
@@ -775,7 +778,10 @@ Slice::Container::createStruct(const string& name, bool local)
nameIsLegal(name, "structure"); // Don't return here -- we create the struct anyway.
- checkForGlobalDef(name, "structure"); // Don't return here -- we create the struct anyway.
+ if(nt == Real)
+ {
+ checkForGlobalDef(name, "structure"); // Don't return here -- we create the struct anyway.
+ }
StructPtr p = new Struct(this, name, local);
_contents.push_back(p);
@@ -783,7 +789,8 @@ Slice::Container::createStruct(const string& name, bool local)
}
SequencePtr
-Slice::Container::createSequence(const string& name, const TypePtr& type, const StringList& metaData, bool local)
+Slice::Container::createSequence(const string& name, const TypePtr& type, const StringList& metaData, bool local,
+ NodeType nt)
{
checkPrefix(name);
@@ -826,7 +833,10 @@ Slice::Container::createSequence(const string& name, const TypePtr& type, const
nameIsLegal(name, "sequence"); // Don't return here -- we create the sequence anyway.
- checkForGlobalDef(name, "sequence"); // Don't return here -- we create the sequence anyway.
+ if(nt == Real)
+ {
+ checkForGlobalDef(name, "sequence"); // Don't return here -- we create the sequence anyway.
+ }
//
// If sequence is non-local, element type cannot be local.
@@ -844,7 +854,8 @@ Slice::Container::createSequence(const string& name, const TypePtr& type, const
DictionaryPtr
Slice::Container::createDictionary(const string& name, const TypePtr& keyType, const StringList& keyMetaData,
- const TypePtr& valueType, const StringList& valueMetaData, bool local)
+ const TypePtr& valueType, const StringList& valueMetaData, bool local,
+ NodeType nt)
{
checkPrefix(name);
@@ -887,9 +898,12 @@ Slice::Container::createDictionary(const string& name, const TypePtr& keyType, c
nameIsLegal(name, "dictionary"); // Don't return here -- we create the dictionary anyway.
- checkForGlobalDef(name, "dictionary"); // Don't return here -- we create the dictionary anyway.
+ if(nt == Real)
+ {
+ checkForGlobalDef(name, "dictionary"); // Don't return here -- we create the dictionary anyway.
+ }
- if(!Dictionary::legalKeyType(keyType))
+ if(nt == Real && !Dictionary::legalKeyType(keyType))
{
_unit->error("dictionary `" + name + "' uses an illegal key type");
return 0;
@@ -915,7 +929,7 @@ Slice::Container::createDictionary(const string& name, const TypePtr& keyType, c
}
EnumPtr
-Slice::Container::createEnum(const string& name, bool local)
+Slice::Container::createEnum(const string& name, bool local, NodeType nt)
{
checkPrefix(name);
@@ -947,7 +961,10 @@ Slice::Container::createEnum(const string& name, bool local)
nameIsLegal(name, "enumeration"); // Don't return here -- we create the enumeration anyway.
- checkForGlobalDef(name, "enumeration"); // Don't return here -- we create the enumeration anyway.
+ if(nt == Real)
+ {
+ checkForGlobalDef(name, "enumeration"); // Don't return here -- we create the enumeration anyway.
+ }
EnumPtr p = new Enum(this, name, local);
_contents.push_back(p);
@@ -994,7 +1011,7 @@ Slice::Container::createEnumerator(const string& name)
ConstPtr
Slice::Container::createConst(const string name, const TypePtr& constType, const StringList& metaData,
- const SyntaxTreeBasePtr& literalType, const string& value)
+ const SyntaxTreeBasePtr& literalType, const string& value, NodeType nt)
{
checkPrefix(name);
@@ -1026,12 +1043,15 @@ Slice::Container::createConst(const string name, const TypePtr& constType, const
nameIsLegal(name, "constant"); // Don't return here -- we create the constant anyway.
- checkForGlobalDef(name, "constant"); // Don't return here -- we create the constant anyway.
+ if(nt == Real)
+ {
+ checkForGlobalDef(name, "constant"); // Don't return here -- we create the constant anyway.
+ }
//
// Check that the constant type is legal.
//
- if(!Const::isLegalType(name, constType, _unit))
+ if(nt == Real && !Const::isLegalType(name, constType, _unit))
{
return 0;
}
@@ -1039,7 +1059,7 @@ Slice::Container::createConst(const string name, const TypePtr& constType, const
//
// Check that the type of the constant is compatible with the type of the initializer.
//
- if(!Const::typesAreCompatible(name, constType, literalType, value, _unit))
+ if(nt == Real && !Const::typesAreCompatible(name, constType, literalType, value, _unit))
{
return 0;
}
@@ -1047,7 +1067,7 @@ Slice::Container::createConst(const string name, const TypePtr& constType, const
//
// Check that the initializer is in range.
//
- if(!Const::isInRange(name, constType, value, _unit))
+ if(nt == Real && !Const::isInRange(name, constType, value, _unit))
{
return 0;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 16:52:41 +0000