[beast/devel: 5/16] SFIDL: get rid of 'ConstIdent' in IDL files

[Tim Janik <timj src gnome org>]

commit 754fbf9236c302ebb89e82bf94c7d9ad5838fa44
Author: Tim Janik <timj gnu org>
Date:   Tue Dec 25 13:54:11 2012 +0100

    SFIDL: get rid of 'ConstIdent' in IDL files

 bse/bsecore.idl     |   18 ------------------
 sfi/sfidl-parser.cc |   12 +++++++-----
 2 files changed, 7 insertions(+), 23 deletions(-)
---
diff --git a/bse/bsecore.idl b/bse/bsecore.idl
index 2579d9c..5a7e472 100644
--- a/bse/bsecore.idl
+++ b/bse/bsecore.idl
@@ -19,24 +19,6 @@ Const MININT = -2147483648;
 Const MAXNUM = +9223372036854775807;
 Const MINNUM = -9223372036854775808;
 Const MINDB = -96; /* 32bit:-192 24bit:-144 16bit:-96 */
-/* note numbers */
-ConstIdent NOTE_C   = SFI_NOTE_C;
-ConstIdent NOTE_Cis = SFI_NOTE_Cis;
-ConstIdent NOTE_Des = SFI_NOTE_Des;
-ConstIdent NOTE_D   = SFI_NOTE_D;
-ConstIdent NOTE_Dis = SFI_NOTE_Dis;
-ConstIdent NOTE_Es  = SFI_NOTE_Es;
-ConstIdent NOTE_E   = SFI_NOTE_E;
-ConstIdent NOTE_F   = SFI_NOTE_F;
-ConstIdent NOTE_Fis = SFI_NOTE_Fis;
-ConstIdent NOTE_Ges = SFI_NOTE_Ges;
-ConstIdent NOTE_G   = SFI_NOTE_G;
-ConstIdent NOTE_Gis = SFI_NOTE_Gis;
-ConstIdent NOTE_As  = SFI_NOTE_As;
-ConstIdent NOTE_A   = SFI_NOTE_A;
-ConstIdent NOTE_Ais = SFI_NOTE_Ais;
-ConstIdent NOTE_Bes = SFI_NOTE_Bes;
-ConstIdent NOTE_B   = SFI_NOTE_B;
 /* standard sequences */
 sequence IntSeq {
   Int    ints;
diff --git a/sfi/sfidl-parser.cc b/sfi/sfidl-parser.cc
index e5e4c1f..59aa5dc 100644
--- a/sfi/sfidl-parser.cc
+++ b/sfi/sfidl-parser.cc
@@ -87,7 +87,7 @@ enum ExtraToken {
   TOKEN_GROUP,
   TOKEN_USING,
   TOKEN_CONST,
-  TOKEN_CONST_IDENT,
+  /*TOKEN_CONST_IDENT,*/
   TOKEN_INFO,
   TOKEN_ISTREAM,
   TOKEN_JSTREAM,
@@ -97,7 +97,7 @@ enum ExtraToken {
 const char *token_symbols[] = {
   "namespace", "interface", "enum", "record", "sequence",
   "property", "group", "using",
-  "Const", "ConstIdent", "Info", "IStream", "JStream", "OStream",
+  "Const", /*"ConstIdent",*/ "Info", "IStream", "JStream", "OStream",
   0
 };
 bool operator== (GTokenType t, ExtraToken e) { return (int) t == (int) e; }
@@ -826,14 +826,16 @@ GTokenType Parser::parseNamespace()
 		return expected_token;
 	    }
 	    break;
-	  case TOKEN_CONST_IDENT:
+#if 0
+        case TOKEN_CONST_IDENT:
 	    {
 	      GTokenType expected_token = parseConstant (true);
 	      if (expected_token != G_TOKEN_NONE)
 		return expected_token;
 	    }
 	    break;
-	  case TOKEN_USING:
+#endif
+        case TOKEN_USING:
 	    {
 	      parse_or_return (TOKEN_USING);
 	      parse_or_return (TOKEN_NAMESPACE);
@@ -925,7 +927,7 @@ GTokenType Parser::parseConstant (bool isident)
    */
   Constant cdef;
   if (isident)
-    parse_or_return (TOKEN_CONST_IDENT);
+    g_assert_not_reached (); /* parse_or_return (TOKEN_CONST_IDENT); */
   else
     parse_or_return (TOKEN_CONST);
   parse_or_return (G_TOKEN_IDENTIFIER);