patch::: 1.3.136.jcn3

[lilypond.git] / lily / keyword.cc

diff --git a/lily/keyword.cc b/lily/keyword.cc
index 2ccb446e2707e0973a11745440d4268fa98c21e8..e235d6a9734337e162da0cd262b3e341bf616992 100644 (file)
--- a/lily/keyword.cc
+++ b/lily/keyword.cc
@@ -1,79 +1,62 @@
 /*
   keyword.cc -- keywords and identifiers
  */
-
+#include <string.h>
 #include <stdlib.h>
-
-#include "glob.hh"
-#include "lexer.hh"
-//#include "mudobs.hh"
-//#include "gram.hh"
-
-/* for the keyword table */
-struct Keyword_ent
-{
-    char const *name;
-    int     tokcode;
-};
-
-struct Keyword_table
-{
-    Keyword_ent *table;
-    int     maxkey;
-    Keyword_table(Keyword_ent *);
-    int     lookup(char const *s) const;
-};
+#include "keyword.hh"
 
 
 /* for qsort */
 int
-        tabcmp(void const * p1, void const * p2)
+      tabcmp (void const * p1, void const * p2)
 {
-    return strcmp(((Keyword_ent const *) p1)->name,
-                  ((Keyword_ent const *) p2)->name);
+  return strcmp (( (Keyword_ent const *) p1)->name,
+ ((Keyword_ent const *) p2)->name);
 }
 
-Keyword_table::Keyword_table(Keyword_ent *tab)
+Keyword_table::Keyword_table (Keyword_ent *tab)
 {
-    table = tab;
+  table = tab;
 
-    /* count keywords */
-    for (maxkey = 0; table[maxkey].name; maxkey++);
+  /* count keywords */
+  for (maxkey = 0; table[maxkey].name; maxkey++)
+    ;
 
-    /* sort them */
-    qsort(table, maxkey, sizeof(Keyword_ent), tabcmp);
+  /* sort them */
+  qsort (table, maxkey, sizeof (Keyword_ent), tabcmp);
 }
 
 /*
   lookup with binsearch, return tokencode.
 */
 int
-Keyword_table::lookup(char const *s)const
+Keyword_table::lookup (char const *s) const
 {
-    int     lo,
-            hi,
-            cmp,
-            result;
-    lo = 0;
-    hi = maxkey;
-
-    /* binary search */
-    do
-    {
-        cmp = (lo + hi) / 2;
-
-        result = strcmp(s, table[cmp].name);
-
-        if (result < 0)
-            hi = cmp;
-        else
-            lo = cmp;
+  int lo;
+  int hi;
+  int cmp;
+  int result;
+  lo = 0;
+  hi = maxkey;
+
+  /* binary search */
+  do
+  {
+      cmp = (lo + hi) / 2;
+
+      result = strcmp (s, table[cmp].name);
+
+      if (result < 0)
+          hi = cmp;
+      else
+          lo = cmp;
+    }
+  while (hi - lo > 1);
+  if (!strcmp (s, table[lo].name))
+  {
+      return table[lo].tokcode;
     }
-    while (hi - lo > 1);
-    if (!strcmp(s, table[lo].name))
-    {
-        return table[lo].tokcode;
-    } else
-        return -1;              /* not found */
+  else
+      return -1;              /* not found */
 }