Mark the functions g_hash_table_freeze, g_hash_table_thaw and thus

[platform/upstream/glib.git] / gscanner.c

diff --git a/gscanner.c b/gscanner.c
index 2852860..cbc2e1e 100644 (file)
--- a/gscanner.c
+++ b/gscanner.c
@@ -48,7 +48,7 @@
 #include       <errno.h>
 #include       <sys/types.h>   /* needed for sys/stat.h */
 #include       <sys/stat.h>
-#ifdef _MSC_VER
+#ifdef G_OS_WIN32
 #include       <io.h>          /* For _read() */
 #endif
 
@@ -89,8 +89,9 @@ static GScannerConfig g_scanner_config_template =
    )                   /* cset_identifier_first */,
   (
    G_CSET_a_2_z
-   "_0123456789"
+   "_"
    G_CSET_A_2_Z
+   G_CSET_DIGITS
    G_CSET_LATINS
    G_CSET_LATINC
    )                   /* cset_identifier_nth */,
@@ -189,6 +190,8 @@ g_scanner_new (GScannerConfig       *config_templ)
   
   scanner->config->case_sensitive      = config_templ->case_sensitive;
   scanner->config->cset_skip_characters        = config_templ->cset_skip_characters;
+  if (!scanner->config->cset_skip_characters)
+    scanner->config->cset_skip_characters = "";
   scanner->config->cset_identifier_first= config_templ->cset_identifier_first;
   scanner->config->cset_identifier_nth = config_templ->cset_identifier_nth;
   scanner->config->cpair_comment_single        = config_templ->cpair_comment_single;
@@ -562,17 +565,21 @@ g_scanner_scope_foreach_symbol (GScanner       *scanner,
 void
 g_scanner_freeze_symbol_table (GScanner *scanner)
 {
-  g_return_if_fail (scanner != NULL);
-  
-  g_hash_table_freeze (scanner->symbol_table);
+#ifdef G_ENABLE_DEBUG
+  static gboolean first_call = TRUE;
+
+  if (first_call)
+    {
+      g_warning("g_scanner_freeze_symbol_table and "
+               "g_scanner_thaw_symbol_table are deprecated.");
+      first_call = FALSE;
+    }
+#endif /* G_ENABLE_DEBUG */
 }
 
 void
 g_scanner_thaw_symbol_table (GScanner *scanner)
 {
-  g_return_if_fail (scanner != NULL);
-  
-  g_hash_table_thaw (scanner->symbol_table);
 }
 
 GTokenType
@@ -973,7 +980,7 @@ g_scanner_unexp_token (GScanner             *scanner,
                  "%s%s `%s'",
                  print_unexp ? "" : "invalid ",
                  identifier_spec,
-                 scanner->value.v_string);
+                 scanner->token == G_TOKEN_IDENTIFIER ? scanner->value.v_string : "null");
       break;
       
     case G_TOKEN_BINARY:
@@ -1075,6 +1082,10 @@ g_scanner_unexp_token (GScanner          *scanner,
                  identifier_spec);
       break;
       
+    case G_TOKEN_EOF:
+      g_snprintf (expected_string, expected_string_len, "end of file");
+      break;
+
     case G_TOKEN_NONE:
       break;
     }
@@ -1607,9 +1618,8 @@ g_scanner_get_token_ll    (GScanner       *scanner,
              token = G_TOKEN_COMMENT_SINGLE;
              in_comment_single = TRUE;
              gstring = g_string_new ("");
-             while ((ch = g_scanner_get_char (scanner,
-                                              line_p,
-                                              position_p)) != 0)
+             ch = g_scanner_get_char (scanner, line_p, position_p);
+             while (ch != 0)
                {
                  if (ch == config->cpair_comment_single[1])
                    {
@@ -1619,7 +1629,7 @@ g_scanner_get_token_ll    (GScanner       *scanner,
                    }
                  
                  gstring = g_string_append_c (gstring, ch);
-                 ch = 0;
+                 ch = g_scanner_get_char (scanner, line_p, position_p);
                }
            }
          else if (config->scan_identifier && ch &&