mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update to (and require!) libIDL 0.5.8. 

Fix silly argument processing brokenness.
Prepare for IDL_tree_to_IDL when it arrives.
Proper basename stuff for #ifdef __gen_nsIFoo_h__ and others.
Handle empty interfaces.
Dead code trimming (ident, etc.).
Typedef support, including arrays.
nsVarArgs instead of ... in C++ headers.
Fix #include scanning bug that caused pain when we skipped an include that
had already been processed.
This commit is contained in:
shaver%netscape.com 1999-01-11 16:56:45 +00:00
Родитель c24ee11c41
Коммит 2b2e69b38c
8 изменённых файлов: 170 добавлений и 142 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
xpcom/tools/xpidl/README
Просмотреть файл

@ -1,11 +1,13 @@
Wed Dec 2 14:35:41 EST 1998
xpidl depends on Andrew Veliath and Elliot Lee's libIDL, a part of the
GNOME ORBit C ORB. We currently require libIDL >= 0.5.7, which in turn
requires glib >= 1.1.5.
GNOME ORBit C ORB. We currently require libIDL >= 0.5.8, which in turn
requires glib >= 1.1.7.
libIDL builds for Linux and Win32 can be found, along with source tarballs,
at http://www.rpi.edu/~veliaa/libIDL/, and Win32 users will need glib 1.1 and
glib 1.1-dev from http://user.sgic.fi/~tml/gimp/win32/. There are currently
no Makefiles for Windows, but people _are_ building on this platform, so
hopefully they'll check their magic in soon.
glib tarballs and RPMs for Linux can be found through http://www.gtk.org.

2
xpcom/tools/xpidl/xpidl.c
Просмотреть файл

@ -108,7 +108,9 @@ main(int argc, char *argv[])
}
basename = argv[i + 1];
i++;
break;
default:
fprintf(stderr, "unknown option %s\n", argv[i]);
xpidl_usage(argc, argv);
return 1;
}

104
xpcom/tools/xpidl/xpidl_header.c
Просмотреть файл

@ -33,6 +33,17 @@
(IDL_NODE_TYPE(node) == IDLN_IDENT && \
UP_IS_AGGREGATE(node)) )
static void
dump_IDL(TreeState *state)
{
fputs(" <IDL> ", state->file);
}
#define DUMP_IDL_COMMENT(state) \
fputs("\n /* ", state->file); \
dump_IDL(state); \
fputs(" */\n", state->file);
static gboolean
ident(TreeState *state)
{
@ -55,14 +66,15 @@ pass_1(TreeState *state)
if (state->tree) {
fprintf(state->file, "/*\n * DO NOT EDIT. THIS FILE IS GENERATED FROM"
" %s.idl\n */\n", state->basename);
fprintf(state->file, "\n#ifndef __%s_h__\n#define __%s_h__\n\n",
fprintf(state->file, "\n#ifndef __gen_%s_h__\n"
"#define __gen_%s_h__\n\n",
state->basename, state->basename);
if (g_hash_table_size(state->includes)) {
g_hash_table_foreach(state->includes, write_header, state);
fputc('\n', state->file);
}
} else {
fprintf(state->file, "\n#endif /* __%s_h__ */\n", state->basename);
fprintf(state->file, "\n#endif /* __gen_%s_h__ */\n", state->basename);
}
return TRUE;
}
@ -91,7 +103,7 @@ interface(TreeState *state)
char *className = IDL_IDENT(IDL_INTERFACE(iface).ident).str;
const char *iid;
fprintf(state->file, "/* starting interface %s */\n",
fprintf(state->file, "\n/* starting interface %s */\n",
className);
iid = IDL_tree_property_get(iface, "uuid");
if (iid) {
@ -117,10 +129,8 @@ interface(TreeState *state)
if ((iter = IDL_INTERFACE(iface).inheritance_spec)) {
fputs(" : ", state->file);
for (; iter; iter = IDL_LIST(iter).next) {
state->tree = IDL_LIST(iter).data;
fputs("public ", state->file);
if (!ident(state))
return FALSE;
fprintf(state->file, "public %s",
IDL_IDENT(IDL_LIST(iter).data).str);
if (IDL_LIST(iter).next)
fputs(", ", state->file);
}
@ -138,7 +148,7 @@ interface(TreeState *state)
state->tree = IDL_INTERFACE(iface).body;
if (!process_node(state))
if (state->tree && !process_node(state))
return FALSE;
fputs("};\n", state->file);
@ -346,19 +356,7 @@ static gboolean
attr_dcl(TreeState *state)
{
gboolean ro = IDL_ATTR_DCL(state->tree).f_readonly;
IDL_tree orig = state->tree;
fprintf(state->file, "\n /* %sattribute ",
ro ? "readonly " : "");
state->tree = IDL_ATTR_DCL(state->tree).param_type_spec;
if (state->tree && !type(state))
return FALSE;
fputs(" ", state->file);
state->tree = IDL_ATTR_DCL(orig).simple_declarations;
if (state->tree && !process_node(state))
return FALSE;
fputs("; */\n", state->file);
state->tree = orig;
DUMP_IDL_COMMENT(state);
return attr_accessor(state, TRUE) && (ro || attr_accessor(state, FALSE));
}
@ -379,6 +377,34 @@ do_enum(TreeState *state)
return TRUE;
}
static gboolean
do_typedef(TreeState *state)
{
IDL_tree type = IDL_TYPE_DCL(state->tree).type_spec,
dcls = IDL_TYPE_DCL(state->tree).dcls,
complex;
fputs("typedef ", state->file);
fputs(" ", state->file);
if (IDL_NODE_TYPE(type) == IDLN_TYPE_SEQUENCE) {
fprintf(stderr, "SEQUENCE!\n");
} else {
state->tree = type;
if (!xpcom_type(state))
return FALSE;
if (IDL_NODE_TYPE(complex = IDL_LIST(dcls).data) == IDLN_TYPE_ARRAY) {
fprintf(state->file, "%s[%d]",
IDL_IDENT(IDL_TYPE_ARRAY(complex).ident).str,
IDL_INTEGER(IDL_LIST(IDL_TYPE_ARRAY(complex).size_list).
data).value);
} else {
fputs(IDL_IDENT(IDL_LIST(dcls).data).str, state->file);
}
}
fputs(";\n", state->file);
return TRUE;
}
/*
* param generation:
* in string foo --> nsString *foo
@ -416,20 +442,8 @@ op_dcl(TreeState *state)
{
struct _IDL_OP_DCL op = IDL_OP_DCL(state->tree);
IDL_tree iter;
state->tree = op.op_type_spec;
fputs("\n /* ", state->file);
if (!type(state))
return FALSE;
fputs(" ", state->file);
state->tree = op.ident;
if (state->tree && !process_node(state))
return FALSE;
state->tree = op.parameter_dcls;
if (!param_dcls(state))
return FALSE;
if (op.f_varargs)
fputs(", ...", state->file);
fputs("); */\n", state->file);
DUMP_IDL_COMMENT(state);
fprintf(state->file, " NS_IMETHOD %s(", IDL_IDENT(op.ident).str);
for (iter = op.parameter_dcls; iter; iter = IDL_LIST(iter).next) {
@ -455,9 +469,8 @@ op_dcl(TreeState *state)
}
/* varargs go last */
/* XXX this should be ``nsIVarArgs *_varargs'', not ``...'', I guess */
if (op.f_varargs) {
fputs("...", state->file);
fputs("nsVarArgs *_varargs", state->file);
}
fputs(") = 0;\n", state->file);
return TRUE;
@ -491,28 +504,13 @@ nodeHandler *headerDispatch()
if (!initialized) {
table[IDLN_NONE] = pass_1;
table[IDLN_LIST] = list;
table[IDLN_IDENT] = ident;
table[IDLN_ATTR_DCL] = attr_dcl;
table[IDLN_OP_DCL] = op_dcl;
table[IDLN_PARAM_DCL] = param_dcls;
table[IDLN_TYPE_INTEGER] = type_integer;
table[IDLN_TYPE_FLOAT] = type;
table[IDLN_TYPE_FIXED] = type;
table[IDLN_TYPE_CHAR] = type;
table[IDLN_TYPE_WIDE_CHAR] = type;
table[IDLN_TYPE_STRING] = type;
table[IDLN_TYPE_WIDE_STRING] = type;
table[IDLN_TYPE_BOOLEAN] = type;
table[IDLN_TYPE_OCTET] = type;
table[IDLN_TYPE_ANY] = type;
table[IDLN_TYPE_OBJECT] = type;
table[IDLN_TYPE_ENUM] = do_enum;
table[IDLN_TYPE_SEQUENCE] = type;
table[IDLN_TYPE_ARRAY] = type;
table[IDLN_TYPE_STRUCT] = type;
table[IDLN_TYPE_UNION] = type;
table[IDLN_INTERFACE] = interface;
table[IDLN_CODEFRAG] = codefrag;
table[IDLN_TYPE_DCL] = do_typedef;
initialized = TRUE;
}

44
xpcom/tools/xpidl/xpidl_idl.c
Просмотреть файл

@ -54,7 +54,8 @@ xpidl_list_foreach(IDL_tree p, IDL_tree_func foreach, gpointer user_data)
{
IDL_tree iter = p;
for (; iter; iter = IDL_LIST(iter).next)
if (!foreach(IDL_LIST(iter).data, user_data))
if (!foreach(IDL_LIST(iter).data,
IDL_tree_get_scope(IDL_LIST(iter).data), user_data))
return;
}
@ -155,6 +156,8 @@ fopen_from_includes(const char *filename, const char *mode,
file = fopen(filebuf, mode);
free(filebuf);
}
if (!file)
fprintf(stderr, "can't open %s for reading\n", filename);
return file;
}
@ -382,6 +385,14 @@ input_callback(IDL_input_reason reason, union IDL_input_data *cb_data,
#endif
/* now continue getting data from new file */
goto fill_start;
} else {
/*
* if we started with a #include, but we've already
* processed that file, we need to continue scanning
* for special sequences.
*/
data->f_include = INPUT_IN_NONE;
goto scan_for_special;
}
}
} else {
@ -426,7 +437,7 @@ int
xpidl_process_idl(char *filename, IncludePathEntry *include_path,
char *basename)
{
char *tmp, *outname;
char *tmp, *outname, *mode_outname;
IDL_tree top;
TreeState state;
int rv;
@ -453,37 +464,37 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path,
return 0;
}
if (!basename) {
basename = g_strdup(filename);
tmp = strrchr(basename, '.');
if (tmp)
*tmp = '\0';
} else {
basename = strdup(basename);
}
state.basename = strdup(filename);
tmp = strrchr(state.basename, '.');
if (tmp)
*tmp = '\0';
if (!basename)
outname = strdup(state.basename);
else
outname = strdup(basename);
state.basename = basename;
state.includes = stack.includes;
state.include_path = include_path;
nodeDispatch[TREESTATE_HEADER] = headerDispatch();
nodeDispatch[TREESTATE_TYPELIB] = typelibDispatch();
nodeDispatch[TREESTATE_DOC] = docDispatch();
if (generate_headers) {
if (strcmp(basename, "-")) {
outname = g_strdup_printf("%s.h", basename);
state.file = fopen(outname, "w");
if (strcmp(outname, "-")) {
mode_outname = g_strdup_printf("%s.h", outname);
state.file = fopen(mode_outname, "w");
if (!state.file) {
perror("error opening output file");
free(outname);
free(mode_outname);
return 0;
}
free(mode_outname);
} else {
state.file = stdout;
}
state.mode = TREESTATE_HEADER;
state.tree = top;
ok = process_tree(&state);
free(outname);
if (state.file != stdout)
fclose(state.file);
if (!ok)
@ -517,6 +528,7 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path,
return 0;
}
free(state.basename);
free(outname);
/* g_hash_table_foreach(state.includes, free_name, NULL);
g_hash_table_destroy(state.includes);
*/

6
xpcom/typelib/xpidl/README
Просмотреть файл

@ -1,11 +1,13 @@
Wed Dec 2 14:35:41 EST 1998
xpidl depends on Andrew Veliath and Elliot Lee's libIDL, a part of the
GNOME ORBit C ORB. We currently require libIDL >= 0.5.7, which in turn
requires glib >= 1.1.5.
GNOME ORBit C ORB. We currently require libIDL >= 0.5.8, which in turn
requires glib >= 1.1.7.
libIDL builds for Linux and Win32 can be found, along with source tarballs,
at http://www.rpi.edu/~veliaa/libIDL/, and Win32 users will need glib 1.1 and
glib 1.1-dev from http://user.sgic.fi/~tml/gimp/win32/. There are currently
no Makefiles for Windows, but people _are_ building on this platform, so
hopefully they'll check their magic in soon.
glib tarballs and RPMs for Linux can be found through http://www.gtk.org.

2
xpcom/typelib/xpidl/xpidl.c
Просмотреть файл

@ -108,7 +108,9 @@ main(int argc, char *argv[])
}
basename = argv[i + 1];
i++;
break;
default:
fprintf(stderr, "unknown option %s\n", argv[i]);
xpidl_usage(argc, argv);
return 1;
}

104
xpcom/typelib/xpidl/xpidl_header.c
Просмотреть файл

@ -33,6 +33,17 @@
(IDL_NODE_TYPE(node) == IDLN_IDENT && \
UP_IS_AGGREGATE(node)) )
static void
dump_IDL(TreeState *state)
{
fputs(" <IDL> ", state->file);
}
#define DUMP_IDL_COMMENT(state) \
fputs("\n /* ", state->file); \
dump_IDL(state); \
fputs(" */\n", state->file);
static gboolean
ident(TreeState *state)
{
@ -55,14 +66,15 @@ pass_1(TreeState *state)
if (state->tree) {
fprintf(state->file, "/*\n * DO NOT EDIT. THIS FILE IS GENERATED FROM"
" %s.idl\n */\n", state->basename);
fprintf(state->file, "\n#ifndef __%s_h__\n#define __%s_h__\n\n",
fprintf(state->file, "\n#ifndef __gen_%s_h__\n"
"#define __gen_%s_h__\n\n",
state->basename, state->basename);
if (g_hash_table_size(state->includes)) {
g_hash_table_foreach(state->includes, write_header, state);
fputc('\n', state->file);
}
} else {
fprintf(state->file, "\n#endif /* __%s_h__ */\n", state->basename);
fprintf(state->file, "\n#endif /* __gen_%s_h__ */\n", state->basename);
}
return TRUE;
}
@ -91,7 +103,7 @@ interface(TreeState *state)
char *className = IDL_IDENT(IDL_INTERFACE(iface).ident).str;
const char *iid;
fprintf(state->file, "/* starting interface %s */\n",
fprintf(state->file, "\n/* starting interface %s */\n",
className);
iid = IDL_tree_property_get(iface, "uuid");
if (iid) {
@ -117,10 +129,8 @@ interface(TreeState *state)
if ((iter = IDL_INTERFACE(iface).inheritance_spec)) {
fputs(" : ", state->file);
for (; iter; iter = IDL_LIST(iter).next) {
state->tree = IDL_LIST(iter).data;
fputs("public ", state->file);
if (!ident(state))
return FALSE;
fprintf(state->file, "public %s",
IDL_IDENT(IDL_LIST(iter).data).str);
if (IDL_LIST(iter).next)
fputs(", ", state->file);
}
@ -138,7 +148,7 @@ interface(TreeState *state)
state->tree = IDL_INTERFACE(iface).body;
if (!process_node(state))
if (state->tree && !process_node(state))
return FALSE;
fputs("};\n", state->file);
@ -346,19 +356,7 @@ static gboolean
attr_dcl(TreeState *state)
{
gboolean ro = IDL_ATTR_DCL(state->tree).f_readonly;
IDL_tree orig = state->tree;
fprintf(state->file, "\n /* %sattribute ",
ro ? "readonly " : "");
state->tree = IDL_ATTR_DCL(state->tree).param_type_spec;
if (state->tree && !type(state))
return FALSE;
fputs(" ", state->file);
state->tree = IDL_ATTR_DCL(orig).simple_declarations;
if (state->tree && !process_node(state))
return FALSE;
fputs("; */\n", state->file);
state->tree = orig;
DUMP_IDL_COMMENT(state);
return attr_accessor(state, TRUE) && (ro || attr_accessor(state, FALSE));
}
@ -379,6 +377,34 @@ do_enum(TreeState *state)
return TRUE;
}
static gboolean
do_typedef(TreeState *state)
{
IDL_tree type = IDL_TYPE_DCL(state->tree).type_spec,
dcls = IDL_TYPE_DCL(state->tree).dcls,
complex;
fputs("typedef ", state->file);
fputs(" ", state->file);
if (IDL_NODE_TYPE(type) == IDLN_TYPE_SEQUENCE) {
fprintf(stderr, "SEQUENCE!\n");
} else {
state->tree = type;
if (!xpcom_type(state))
return FALSE;
if (IDL_NODE_TYPE(complex = IDL_LIST(dcls).data) == IDLN_TYPE_ARRAY) {
fprintf(state->file, "%s[%d]",
IDL_IDENT(IDL_TYPE_ARRAY(complex).ident).str,
IDL_INTEGER(IDL_LIST(IDL_TYPE_ARRAY(complex).size_list).
data).value);
} else {
fputs(IDL_IDENT(IDL_LIST(dcls).data).str, state->file);
}
}
fputs(";\n", state->file);
return TRUE;
}
/*
* param generation:
* in string foo --> nsString *foo
@ -416,20 +442,8 @@ op_dcl(TreeState *state)
{
struct _IDL_OP_DCL op = IDL_OP_DCL(state->tree);
IDL_tree iter;
state->tree = op.op_type_spec;
fputs("\n /* ", state->file);
if (!type(state))
return FALSE;
fputs(" ", state->file);
state->tree = op.ident;
if (state->tree && !process_node(state))
return FALSE;
state->tree = op.parameter_dcls;
if (!param_dcls(state))
return FALSE;
if (op.f_varargs)
fputs(", ...", state->file);
fputs("); */\n", state->file);
DUMP_IDL_COMMENT(state);
fprintf(state->file, " NS_IMETHOD %s(", IDL_IDENT(op.ident).str);
for (iter = op.parameter_dcls; iter; iter = IDL_LIST(iter).next) {
@ -455,9 +469,8 @@ op_dcl(TreeState *state)
}
/* varargs go last */
/* XXX this should be ``nsIVarArgs *_varargs'', not ``...'', I guess */
if (op.f_varargs) {
fputs("...", state->file);
fputs("nsVarArgs *_varargs", state->file);
}
fputs(") = 0;\n", state->file);
return TRUE;
@ -491,28 +504,13 @@ nodeHandler *headerDispatch()
if (!initialized) {
table[IDLN_NONE] = pass_1;
table[IDLN_LIST] = list;
table[IDLN_IDENT] = ident;
table[IDLN_ATTR_DCL] = attr_dcl;
table[IDLN_OP_DCL] = op_dcl;
table[IDLN_PARAM_DCL] = param_dcls;
table[IDLN_TYPE_INTEGER] = type_integer;
table[IDLN_TYPE_FLOAT] = type;
table[IDLN_TYPE_FIXED] = type;
table[IDLN_TYPE_CHAR] = type;
table[IDLN_TYPE_WIDE_CHAR] = type;
table[IDLN_TYPE_STRING] = type;
table[IDLN_TYPE_WIDE_STRING] = type;
table[IDLN_TYPE_BOOLEAN] = type;
table[IDLN_TYPE_OCTET] = type;
table[IDLN_TYPE_ANY] = type;
table[IDLN_TYPE_OBJECT] = type;
table[IDLN_TYPE_ENUM] = do_enum;
table[IDLN_TYPE_SEQUENCE] = type;
table[IDLN_TYPE_ARRAY] = type;
table[IDLN_TYPE_STRUCT] = type;
table[IDLN_TYPE_UNION] = type;
table[IDLN_INTERFACE] = interface;
table[IDLN_CODEFRAG] = codefrag;
table[IDLN_TYPE_DCL] = do_typedef;
initialized = TRUE;
}

44
xpcom/typelib/xpidl/xpidl_idl.c
Просмотреть файл

@ -54,7 +54,8 @@ xpidl_list_foreach(IDL_tree p, IDL_tree_func foreach, gpointer user_data)
{
IDL_tree iter = p;
for (; iter; iter = IDL_LIST(iter).next)
if (!foreach(IDL_LIST(iter).data, user_data))
if (!foreach(IDL_LIST(iter).data,
IDL_tree_get_scope(IDL_LIST(iter).data), user_data))
return;
}
@ -155,6 +156,8 @@ fopen_from_includes(const char *filename, const char *mode,
file = fopen(filebuf, mode);
free(filebuf);
}
if (!file)
fprintf(stderr, "can't open %s for reading\n", filename);
return file;
}
@ -382,6 +385,14 @@ input_callback(IDL_input_reason reason, union IDL_input_data *cb_data,
#endif
/* now continue getting data from new file */
goto fill_start;
} else {
/*
* if we started with a #include, but we've already
* processed that file, we need to continue scanning
* for special sequences.
*/
data->f_include = INPUT_IN_NONE;
goto scan_for_special;
}
}
} else {
@ -426,7 +437,7 @@ int
xpidl_process_idl(char *filename, IncludePathEntry *include_path,
char *basename)
{
char *tmp, *outname;
char *tmp, *outname, *mode_outname;
IDL_tree top;
TreeState state;
int rv;
@ -453,37 +464,37 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path,
return 0;
}
if (!basename) {
basename = g_strdup(filename);
tmp = strrchr(basename, '.');
if (tmp)
*tmp = '\0';
} else {
basename = strdup(basename);
}
state.basename = strdup(filename);
tmp = strrchr(state.basename, '.');
if (tmp)
*tmp = '\0';
if (!basename)
outname = strdup(state.basename);
else
outname = strdup(basename);
state.basename = basename;
state.includes = stack.includes;
state.include_path = include_path;
nodeDispatch[TREESTATE_HEADER] = headerDispatch();
nodeDispatch[TREESTATE_TYPELIB] = typelibDispatch();
nodeDispatch[TREESTATE_DOC] = docDispatch();
if (generate_headers) {
if (strcmp(basename, "-")) {
outname = g_strdup_printf("%s.h", basename);
state.file = fopen(outname, "w");
if (strcmp(outname, "-")) {
mode_outname = g_strdup_printf("%s.h", outname);
state.file = fopen(mode_outname, "w");
if (!state.file) {
perror("error opening output file");
free(outname);
free(mode_outname);
return 0;
}
free(mode_outname);
} else {
state.file = stdout;
}
state.mode = TREESTATE_HEADER;
state.tree = top;
ok = process_tree(&state);
free(outname);
if (state.file != stdout)
fclose(state.file);
if (!ok)
@ -517,6 +528,7 @@ xpidl_process_idl(char *filename, IncludePathEntry *include_path,
return 0;
}
free(state.basename);
free(outname);
/* g_hash_table_foreach(state.includes, free_name, NULL);
g_hash_table_destroy(state.includes);
*/