KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl/apps: No need to purify source text for tokeniser.

This commit is contained in:
Michal Krol 2009-11-21 20:44:16 +01:00
parent 1cf021475a
commit 6199a0cf89
4 changed files with 24 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/glsl/apps/compile.c
View File

@ -41,7 +41,6 @@ main(int argc,
long size;
char *inbuf;
struct sl_pp_purify_options options;
char *outbuf;
char errmsg[100] = "";
unsigned int errline = 0;
struct sl_pp_context *context;
@ -105,35 +104,25 @@ main(int argc,
memset(&options, 0, sizeof(options));
if (sl_pp_purify(inbuf, &options, &outbuf, errmsg, sizeof(errmsg), &errline)) {
fprintf(out, "$PURIFYERROR %s\n", errmsg);
context = sl_pp_context_create();
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(inbuf);
fclose(out);
return 1;
}
free(inbuf);
context = sl_pp_context_create();
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(outbuf);
fclose(out);
return 1;
}
if (sl_pp_tokenise(context, outbuf, &tokens)) {
if (sl_pp_tokenise(context, inbuf, &options, &tokens)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(outbuf);
free(inbuf);
fclose(out);
return 1;
}
free(outbuf);
free(inbuf);
if (sl_pp_version(context, tokens, &version, &tokens_eaten)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));

23
src/glsl/apps/process.c
View File

@ -40,7 +40,6 @@ main(int argc,
long size;
char *inbuf;
struct sl_pp_purify_options options;
char *outbuf;
char errmsg[100] = "";
unsigned int errline = 0;
struct sl_pp_context *context;
@ -93,35 +92,25 @@ main(int argc,
memset(&options, 0, sizeof(options));
if (sl_pp_purify(inbuf, &options, &outbuf, errmsg, sizeof(errmsg), &errline)) {
fprintf(out, "$PURIFYERROR %s\n", errmsg);
context = sl_pp_context_create();
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(inbuf);
fclose(out);
return 1;
}
free(inbuf);
context = sl_pp_context_create();
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(outbuf);
fclose(out);
return 1;
}
if (sl_pp_tokenise(context, outbuf, &tokens)) {
if (sl_pp_tokenise(context, inbuf, &options, &tokens)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(outbuf);
free(inbuf);
fclose(out);
return 1;
}
free(outbuf);
free(inbuf);
if (sl_pp_version(context, tokens, &version, &tokens_eaten)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));

23
src/glsl/apps/tokenise.c
View File

@ -40,7 +40,6 @@ main(int argc,
long size;
char *inbuf;
struct sl_pp_purify_options options;
char *outbuf;
char errmsg[100] = "";
unsigned int errline = 0;
struct sl_pp_context *context;
@ -90,35 +89,25 @@ main(int argc,
memset(&options, 0, sizeof(options));
if (sl_pp_purify(inbuf, &options, &outbuf, errmsg, sizeof(errmsg), &errline)) {
fprintf(out, "$PURIFYERROR %s\n", errmsg);
context = sl_pp_context_create();
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(inbuf);
fclose(out);
return 1;
}
free(inbuf);
context = sl_pp_context_create();
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(outbuf);
fclose(out);
return 1;
}
if (sl_pp_tokenise(context, outbuf, &tokens)) {
if (sl_pp_tokenise(context, inbuf, &options, &tokens)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(outbuf);
free(inbuf);
fclose(out);
return 1;
}
free(outbuf);
free(inbuf);
for (i = 0; tokens[i].token != SL_PP_EOF; i++) {
switch (tokens[i].token) {

23
src/glsl/apps/version.c
View File

@ -40,7 +40,6 @@ main(int argc,
long size;
char *inbuf;
struct sl_pp_purify_options options;
char *outbuf;
char errmsg[100] = "";
unsigned int errline = 0;
struct sl_pp_context *context;
@ -91,35 +90,25 @@ main(int argc,
memset(&options, 0, sizeof(options));
if (sl_pp_purify(inbuf, &options, &outbuf, errmsg, sizeof(errmsg), &errline)) {
fprintf(out, "$PURIFYERROR %s\n", errmsg);
context = sl_pp_context_create();
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(inbuf);
fclose(out);
return 1;
}
free(inbuf);
context = sl_pp_context_create();
if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(outbuf);
fclose(out);
return 1;
}
if (sl_pp_tokenise(context, outbuf, &tokens)) {
if (sl_pp_tokenise(context, inbuf, &options, &tokens)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
sl_pp_context_destroy(context);
free(outbuf);
free(inbuf);
fclose(out);
return 1;
}
free(outbuf);
free(inbuf);
if (sl_pp_version(context, tokens, &version, &tokens_eaten)) {
fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));