2 files changed, 15 insertions, 16 deletions
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 7fb37c3af41..0643bb81a81 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -850,8 +850,7 @@ out_param_decl
 {
     $$ = $2;
 }
-|
-out_param_decl ',' param_decl
+| out_param_decl ',' param_decl
 {
     unit->error("in parameters cannot follow out parameters");
     $$ = $1;
diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h
index 0d510e7e3d3..d26447b9fe6 100644
--- a/cpp/src/Slice/GrammarUtil.h
+++ b/cpp/src/Slice/GrammarUtil.h
@@ -17,18 +17,18 @@ namespace Slice
 {
 
 class StringTok;
+class StringListTok;
 class TypeStringTok;
 class TypeStringListTok;
-class StringListTok;
 class BoolTok;
 class ExceptionListTok;
 class ClassListTok;
 class EnumeratorListTok;
 
 typedef ::IceUtil::Handle<StringTok> StringTokPtr;
+typedef ::IceUtil::Handle<StringListTok> StringListTokPtr;
 typedef ::IceUtil::Handle<TypeStringTok> TypeStringTokPtr;
 typedef ::IceUtil::Handle<TypeStringListTok> TypeStringListTokPtr;
-typedef ::IceUtil::Handle<StringListTok> StringListTokPtr;
 typedef ::IceUtil::Handle<BoolTok> BoolTokPtr;
 typedef ::IceUtil::Handle<ExceptionListTok> ExceptionListTokPtr;
 typedef ::IceUtil::Handle<ClassListTok> ClassListTokPtr;
@@ -47,39 +47,39 @@ public:
 };
 
 // ----------------------------------------------------------------------
-// TypeStringTok
+// StringListTok
 // ----------------------------------------------------------------------
 
-class SLICE_API TypeStringTok : public GrammarBase
+class SLICE_API StringListTok : public GrammarBase
 {
 public:
 
-    TypeStringTok() { }
-    TypeString v;
+    StringListTok() { }
+    StringList v;
 };
 
 // ----------------------------------------------------------------------
-// TypeStringListTok
+// TypeStringTok
 // ----------------------------------------------------------------------
 
-class SLICE_API TypeStringListTok : public GrammarBase
+class SLICE_API TypeStringTok : public GrammarBase
 {
 public:
 
-    TypeStringListTok() { }
-    TypeStringList v;
+    TypeStringTok() { }
+    TypeString v;
 };
 
 // ----------------------------------------------------------------------
-// StringListTok
+// TypeStringListTok
 // ----------------------------------------------------------------------
 
-class SLICE_API StringListTok : public GrammarBase
+class SLICE_API TypeStringListTok : public GrammarBase
 {
 public:
 
-    StringListTok() { }
-    StringList v;
+    TypeStringListTok() { }
+    TypeStringList v;
 };
 
 // ----------------------------------------------------------------------