along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "getopt.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
/* Conditionalize function prototypes. */
#ifdef PROTOTYPES /* From config.h. */
void add_member_decl P_ ((struct sym *, char *, char *, int,
unsigned, int, int, int, int));
void dump_roots P_ ((FILE *));
-void *ymalloc P_ ((int));
+void *xmalloc P_ ((int));
void add_global_defn P_ ((char *, char *, int, unsigned, int, int, int));
void add_global_decl P_ ((char *, char *, int, unsigned, int, int, int));
void add_define P_ ((char *, char *, int));
and xrealloc. */
void *
-ymalloc (nbytes)
+xmalloc (nbytes)
int nbytes;
{
void *p = malloc (nbytes);
/* Like realloc but print an error and exit if out of memory. */
void *
-yrealloc (p, sz)
+xrealloc (p, sz)
void *p;
int sz;
{
char *s;
{
if (s)
- s = strcpy (ymalloc (strlen (s) + 1), s);
+ s = strcpy (xmalloc (strlen (s) + 1), s);
return s;
}
puts (name);
}
- sym = (struct sym *) ymalloc (sizeof *sym + strlen (name));
+ sym = (struct sym *) xmalloc (sizeof *sym + strlen (name));
bzero (sym, sizeof *sym);
strcpy (sym->name, name);
sym->namesp = scope;
/* Avoid duplicates. */
if (p == NULL || p->sym != sub)
{
- lnk = (struct link *) ymalloc (sizeof *lnk);
- lnk2 = (struct link *) ymalloc (sizeof *lnk2);
+ lnk = (struct link *) xmalloc (sizeof *lnk);
+ lnk2 = (struct link *) xmalloc (sizeof *lnk2);
lnk->sym = sub;
lnk->next = p;
int sc;
unsigned hash;
{
- struct member *m = (struct member *) ymalloc (sizeof *m + strlen (name));
+ struct member *m = (struct member *) xmalloc (sizeof *m + strlen (name));
struct member **list;
struct member *p;
struct member *prev;
make_namespace (name)
char *name;
{
- struct sym *s = (struct sym *) ymalloc (sizeof *s + strlen (name));
+ struct sym *s = (struct sym *) xmalloc (sizeof *s + strlen (name));
bzero (s, sizeof *s);
strcpy (s->name, name);
s->next = all_namespaces;
if (streq (new_name, p->name))
return;
- al = (struct alias *) ymalloc (sizeof *al + strlen (new_name));
+ al = (struct alias *) xmalloc (sizeof *al + strlen (new_name));
strcpy (al->name, new_name);
al->next = p->namesp_aliases;
p->namesp_aliases = al;
if (namespace_sp == namespace_stack_size)
{
int size = max (10, 2 * namespace_stack_size);
- namespace_stack = (struct sym **) yrealloc (namespace_stack, size);
+ namespace_stack = (struct sym **) xrealloc (namespace_stack, size);
namespace_stack_size = size;
}
if (scope_buffer_len + len >= scope_buffer_size)
{
int new_size = max (2 * scope_buffer_size, scope_buffer_len + len);
- scope_buffer = (char *) yrealloc (new_size);
+ scope_buffer = (char *) xrealloc (new_size);
scope_buffer_size = new_size;
}
}
if (!scope_buffer)
{
scope_buffer_size = 1024;
- scope_buffer = (char *) ymalloc (scope_buffer_size);
+ scope_buffer = (char *) xmalloc (scope_buffer_size);
}
*scope_buffer = '\0';
int
process_pp_line ()
{
- int in_comment = 0;
+ int in_comment = 0, in_string = 0;
int c;
char *p = yytext;
}
}
- while (c && (c != '\n' || in_comment))
+ while (c && (c != '\n' || in_comment || in_string))
{
if (c == '\\')
GET (c);
if (GET (c) == '/')
in_comment = 0;
}
+ else if (c == '"')
+ in_string = !in_string;
if (c == '\n')
INCREMENT_LINENO;
GET (c);
}
-
+
return c;
}
else switch (c)
{
case '\n':
+ INCREMENT_LINENO;
case 'a':
case 'b':
case 'f':
else
yyerror ("newline in string constant");
INCREMENT_LINENO;
- goto end_string;
+ break;
default:
break;
if (p == yytext_end - 1)
{
int size = yytext_end - yytext;
- yytext = (char *) yrealloc (yytext, 2 * size);
+ yytext = (char *) xrealloc (yytext, 2 * size);
yytext_end = yytext + 2 * size;
p = yytext + size - 1;
}
if (buffer == NULL)
{
- buffer = (char *) ymalloc (max_regexp);
+ buffer = (char *) xmalloc (max_regexp);
end_buf = &buffer[max_regexp] - 1;
}
case VOID: return "void";
case VOLATILE: return "volatile";
case WHILE: return "while";
+ case MUTABLE: return "mutable";
+ case BOOL: return "bool";
+ case TRUE: return "true";
+ case FALSE: return "false";
+ case SIGNATURE: return "signature";
+ case NAMESPACE: return "namespace";
+ case EXPLICIT: return "explicit";
+ case TYPENAME: return "typename";
+ case CONST_CAST: return "const_cast";
+ case DYNAMIC_CAST: return "dynamic_cast";
+ case REINTERPRET_CAST: return "reinterpret_cast";
+ case STATIC_CAST: return "static_cast";
+ case TYPEID: return "typeid";
+ case USING: return "using";
+ case WCHAR: return "wchar_t";
case YYEOF: return "EOF";
- }
- assert (t < 255);
- b[0] = t;
- b[1] = '\0';
- return b;
+ default:
+ if (t < 255)
+ {
+ b[0] = t;
+ b[1] = '\0';
+ return b;
+ }
+ else
+ return "???";
+ }
}
if (yytext == NULL)
{
int size = 256;
- yytext = (char *) ymalloc (size * sizeof *yytext);
+ yytext = (char *) xmalloc (size * sizeof *yytext);
yytext_end = yytext + size;
}
}
{
char *s;
unsigned h = 0;
- struct kw *k = (struct kw *) ymalloc (sizeof *k);
+ struct kw *k = (struct kw *) xmalloc (sizeof *k);
for (s = name; *s; ++s)
h = (h << 1) ^ *s;
/* Allocate the input buffer */
inbuffer_size = READ_CHUNK_SIZE + 1;
- inbuffer = in = (char *) ymalloc (inbuffer_size);
+ inbuffer = in = (char *) xmalloc (inbuffer_size);
yyline = 1;
/* Set up character class vectors. */
case IDENT:
if (!type_seen)
{
- char *s;
+ char *last_id;
unsigned ident_type_hash = 0;
- parse_qualified_param_ident_or_type (&s);
- for (; *s; ++s)
- ident_type_hash = (ident_type_hash << 1) ^ *s;
- hash = (hash << 1) ^ ident_type_hash;
- type_seen = 1;
+ parse_qualified_param_ident_or_type (&last_id);
+ if (last_id)
+ {
+ /* LAST_ID null means something like `X::*'. */
+ for (; *last_id; ++last_id)
+ ident_type_hash = (ident_type_hash << 1) ^ *last_id;
+ hash = (hash << 1) ^ ident_type_hash;
+ type_seen = 1;
+ }
}
else
MATCH ();
if (len > id_size)
{
int new_size = max (len, 2 * id_size);
- id = (char *) yrealloc (id, new_size);
+ id = (char *) xrealloc (id, new_size);
id_size = new_size;
}
strcpy (id, s);
if (len > id_size)
{
int new_size = max (len, 2 * id_size);
- id = (char *) yrealloc (id, new_size);
+ id = (char *) xrealloc (id, new_size);
id_size = new_size;
}
strcpy (id, "operator");
if (len > id_size)
{
int new_size = max (len, 2 * id_size);
- id = (char *) yrealloc (id, new_size);
+ id = (char *) xrealloc (id, new_size);
id_size = new_size;
}
int len = strlen (yytext) + 1;
if (len > id_size)
{
- id = (char *) yrealloc (id, len);
+ id = (char *) xrealloc (id, len);
id_size = len;
}
strcpy (id, yytext);
struct sym *cls = NULL;
static char *id = NULL;
static int id_size = 0;
-
+
while (LOOKING_AT (IDENT))
{
int len = strlen (yytext) + 1;
if (len > id_size)
{
- id = (char *) yrealloc (id, len);
+ id = (char *) xrealloc (id, len);
id_size = len;
}
strcpy (id, yytext);
while (*path_list && *path_list != PATH_LIST_SEPARATOR)
++path_list;
- p = (struct search_path *) ymalloc (sizeof *p);
- p->path = (char *) ymalloc (path_list - start + 1);
+ p = (struct search_path *) xmalloc (sizeof *p);
+ p->path = (char *) xmalloc (path_list - start + 1);
memcpy (p->path, start, path_list - start);
p->path[path_list - start] = '\0';
p->next = NULL;
if (len + 1 >= buffer_size)
{
buffer_size = max (len + 1, 2 * buffer_size);
- buffer = (char *) yrealloc (buffer, buffer_size);
+ buffer = (char *) xrealloc (buffer, buffer_size);
}
strcpy (buffer, path->path);
if (nread + READ_CHUNK_SIZE >= inbuffer_size)
{
inbuffer_size = nread + READ_CHUNK_SIZE + 1;
- inbuffer = (char *) yrealloc (inbuffer, inbuffer_size);
+ inbuffer = (char *) xrealloc (inbuffer, inbuffer_size);
}
nbytes = fread (inbuffer + nread, 1, READ_CHUNK_SIZE, fp);
if (i >= buffer_size)
{
buffer_size = max (100, buffer_size * 2);
- buffer = (char *) yrealloc (buffer, buffer_size);
+ buffer = (char *) xrealloc (buffer, buffer_size);
}
buffer[i++] = c;
if (i == buffer_size)
{
buffer_size = max (100, buffer_size * 2);
- buffer = (char *) yrealloc (buffer, buffer_size);
+ buffer = (char *) xrealloc (buffer, buffer_size);
}
buffer[i] = '\0';
if (n_input_files == input_filenames_size)
{
input_filenames_size = max (10, 2 * input_filenames_size);
- input_filenames = (char **) yrealloc (input_filenames,
+ input_filenames = (char **) xrealloc (input_filenames,
input_filenames_size);
}
input_filenames[n_input_files++] = xstrdup (optarg);