Changed the grammar for out parameters to deprecate the semicolon syntax

    and use an "out" keyword instead. The old syntax still works, but now
    prints a warning. Fixed up all the test cases that got broken by this
    and add a new test case for out-of-order in and out parameters.
    Refactored the grammar somewhat because, initially, out params added
    something like 50 shift/reduce conflicts. One shift/reduce conflict
    remains, caused by the addition of ICE_OUT to the last production in
    Grammar.y. We could avoid the conflict by removing ICE_OUT from that
    production, but then we wouldn't catch other errors anymore, such as an
    attempt to use "out" as the name of an operation or interface. I've
    added a warning to the Makefile to expect 1 shift/reduce conflict when
    Grammar.y is rebuilt.

1 files changed, 14 insertions, 0 deletions

diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h
index 3d64d605fbd..0d510e7e3d3 100644
--- a/cpp/src/Slice/GrammarUtil.h
+++ b/cpp/src/Slice/GrammarUtil.h
@@ -17,6 +17,7 @@ namespace Slice
 {
 
 class StringTok;
+class TypeStringTok;
 class TypeStringListTok;
 class StringListTok;
 class BoolTok;
@@ -25,6 +26,7 @@ class ClassListTok;
 class EnumeratorListTok;
 
 typedef ::IceUtil::Handle<StringTok> StringTokPtr;
+typedef ::IceUtil::Handle<TypeStringTok> TypeStringTokPtr;
 typedef ::IceUtil::Handle<TypeStringListTok> TypeStringListTokPtr;
 typedef ::IceUtil::Handle<StringListTok> StringListTokPtr;
 typedef ::IceUtil::Handle<BoolTok> BoolTokPtr;
@@ -45,6 +47,18 @@ public:
 };
 
 // ----------------------------------------------------------------------
+// TypeStringTok
+// ----------------------------------------------------------------------
+
+class SLICE_API TypeStringTok : public GrammarBase
+{
+public:
+
+    TypeStringTok() { }
+    TypeString v;
+};
+
+// ----------------------------------------------------------------------
 // TypeStringListTok
 // ----------------------------------------------------------------------