Changed [] syntax to disallow empty metadata: you now have to either have

    metadata with at least one string in the list, or no metadata at all.
Updated scanner so backslash-escaped keywords can be used as identifiers.
Removed ''-style strings from scanner -- only ""-style is now legal.
Changed string literals to fully conform with ISO-C++ rules. (Not all legal
    escape sequences were supported previously.)
Changed grammar to support concatenation of adjacent string literals.
Added support for constants. Parser and scanner are complete, but the
    action for a constant definition is empty for now. Constant definitions
    are supported for bool, byte, integers, floating point, strings, and
    enums. Constants can be defined at global scope and module scope
    (nowhere else). Syntax follows C++ syntax as much as it makes sense
    (e.g., the l and u suffixes for integer constants are not supported).

1 files changed, 28 insertions, 0 deletions

diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h
index 591fa976eed..bc349184dc0 100644
--- a/cpp/src/Slice/GrammarUtil.h
+++ b/cpp/src/Slice/GrammarUtil.h
@@ -22,6 +22,8 @@ class StringListTok;
 class TypeStringTok;
 class TypeStringListTok;
 class BoolTok;
+class IntegerTok;
+class FloatingTok;
 class ExceptionListTok;
 class ClassListTok;
 class EnumeratorListTok;
@@ -31,6 +33,8 @@ typedef ::IceUtil::Handle<StringListTok> StringListTokPtr;
 typedef ::IceUtil::Handle<TypeStringTok> TypeStringTokPtr;
 typedef ::IceUtil::Handle<TypeStringListTok> TypeStringListTokPtr;
 typedef ::IceUtil::Handle<BoolTok> BoolTokPtr;
+typedef ::IceUtil::Handle<IntegerTok> IntegerTokPtr;
+typedef ::IceUtil::Handle<FloatingTok> FloatingTokPtr;
 typedef ::IceUtil::Handle<ExceptionListTok> ExceptionListTokPtr;
 typedef ::IceUtil::Handle<ClassListTok> ClassListTokPtr;
 typedef ::IceUtil::Handle<EnumeratorListTok> EnumeratorListTokPtr;
@@ -84,6 +88,30 @@ public:
 };
 
 // ----------------------------------------------------------------------
+// IntegerTok
+// ----------------------------------------------------------------------
+
+class SLICE_API IntegerTok : public GrammarBase
+{
+public:
+
+    IntegerTok() { }
+    long v;
+};
+
+// ----------------------------------------------------------------------
+// FloatingTok
+// ----------------------------------------------------------------------
+
+class SLICE_API FloatingTok : public GrammarBase
+{
+public:
+
+    FloatingTok() { }
+    double v;
+};
+
+// ----------------------------------------------------------------------
 // BoolTok
 // ----------------------------------------------------------------------