Slice grammar improvements (#1590)

This is a backport of the Slice grammar improvements made by @InsertCreativityHere  in 865ff42#diff-3c507567a987cdf989038742a6964ad6d947511ef75ea5ab823136035205722dR67

config/Make.project.rules

@@ -178,8 +178,7 @@ endef
 define make-bison
 $1/%.h $1/%.cpp: $1/%.y
 	@$(RM) $$*.h $$*.cpp
-	bison -dvt $2 -o $1/$$*.cpp $$<
-	@$(MV) $1/$$*.hpp $1/$$*.h
+	bison -tv $2 --header=$1/$$*.h -o $1/$$*.cpp $$<
 	@$(RM) $1/$$*.output
 endef
 
@@ -190,10 +189,6 @@ define make-flex
 $1/%.cpp: $1/%.l
 	@$(RM) $$@
 	flex $2 -o $$@ $$<
-	@$(MV) $$@ [email protected]
-	@echo '#include <IceUtil/ScannerConfig.h>' >> $$@
-	@cat [email protected] >> $$@
-	@$(RM) [email protected]
 endef
 
 #

cpp/include/IceUtil/ScannerConfig.h

@@ -13,7 +13,7 @@
 // in flex generated Scanners are defined.
 //
 // in C99 conformant compilers we don't need to include it because the
-// header is included by inttypes.h, that is included by the gernated
+// header is included by inttypes.h, that is included by the generated
 // Scanners.
 //
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)
@@ -37,4 +37,10 @@
 #   pragma clang diagnostic ignored "-Wunused-but-set-variable"
 #endif
 
+
+#ifdef __GNUC__
+#  pragma GCC diagnostic ignored "-Wunused-function"
+#  pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
+
 #endif

cpp/src/Glacier2/Instrumentation.ice

@@ -16,107 +16,50 @@ module Instrumentation
 
 local interface SessionObserver extends Ice::Instrumentation::Observer
 {
-    /**
-     *
-     * Notification of a forwarded request. This also implies removing
-     * the event from the queue.
-     *
-     * @param client True if client request, false if server request.
-     *
-     **/
+    /// Notification of a forwarded request. This also implies removing the event from the queue.
+    /// @param client True if client request, false if server request.
     void forwarded(bool client);
 
-    /**
-     *
-     * Notification of a queued request.
-     *
-     * @param client True if client request, false if server request.
-     *
-     **/
+    /// Notification of a queued request.
+    /// @param client True if client request, false if server request.
     void queued(bool client);
 
-    /**
-     *
-     * Notification of a overridden request. This implies adding and
-     * removing an event to the queue.
-     *
-     * @param client True if client request, false if server request.
-     *
-     **/
+    /// Notification of a overridden request. This implies adding and removing an event to the queue.
+    /// @param client True if client request, false if server request.
     void overridden(bool client);
 
-    /**
-     *
-     * Notification of a routing table size change.
-     *
-     * @param delta The size adjustement.
-     *
-     **/
+    /// Notification of a routing table size change.
+    /// @param delta The size adjustement.
     void routingTableSize(int delta);
 }
 
-/**
- *
- * The ObserverUpdater interface is implemented by Glacier2 and an
- * instance of this interface is provided on initialization to the
- * RouterObserver object.
- *
- * This interface can be used by add-ins imlementing the
- * RouterObserver interface to update the obsevers of observed
- * objects.
- *
- **/
+/// The ObserverUpdater interface is implemented by Glacier2 and an instance of this interface is provided on
+/// initialization to the RouterObserver object.
+/// This interface can be used by add-ins imlementing the RouterObserver interface to update the obsevers of observed
+/// objects.
 local interface ObserverUpdater
 {
-    /**
-     *
-     * Update the router sessions.
-     *
-     * When called, this method goes through all the sessions and for
-     * each session RouterObserver::getSessionObserver is
-     * called. The implementation of getSessionObserver has the
-     * possibility to return an updated observer if necessary.
-     *
-     **/
+    /// Update the router sessions.
+    /// When called, this method goes through all the sessions and for each session RouterObserver::getSessionObserver
+    /// is called. The implementation of getSessionObserver has the possibility to return an updated observer if
+    /// necessary.
     void updateSessionObservers();
 }
 
-/**
- *
- * The router observer interface used by Glacier2 to obtain and update
- * observers for its observeable objects. This interface should be
- * implemented by add-ins that wish to observe Glacier2 objects in
- * order to collect statistics.
- *
- **/
+/// The router observer interface used by Glacier2 to obtain and update observers for its observeable objects. This
+/// interface should be implemented by add-ins that wish to observe Glacier2 objects in order to collect statistics.
 local interface RouterObserver
 {
-    /**
-     *
-     * This method should return an observer for the given session.
-     *
-     * @param id The id of the session (the user id or the SSL DN).
-     *
-     * @param con The connection associated to the session.
-     *
-     * @param routingTableSize The size of the routing table for this
-     * session.
-     *
-     * @param old The previous observer, only set when updating an
-     * existing observer.
-     *
-     **/
+    /// This method should return an observer for the given session.
+    /// @param id The id of the session (the user id or the SSL DN).
+    /// @param con The connection associated to the session.
+    /// @param routingTableSize The size of the routing table for this session.
+    /// @param old The previous observer, only set when updating an existing observer.
     SessionObserver getSessionObserver(string id, Ice::Connection con, int routingTableSize, SessionObserver old);
 
-    /**
-     *
-     * Glacier2 calls this method on initialization. The add-in
-     * implementing this interface can use this object to get Glacier2
-     * to re-obtain observers for topics and subscribers.
-     *
-     * @param updater The observer updater object.
-     *
-     **/
+    /// Glacier2 calls this method on initialization. The add-in implementing this interface can use this object to get
+    /// Glacier2 to re-obtain observers for topics and subscribers.
+    /// @param updater The observer updater object.
     void setObserverUpdater(ObserverUpdater updater);
 }