Mesa (glsl-pp-rework-2): glsl/apps: Use glsl pp public interface.
Michał Król
michal at kemper.freedesktop.org
Fri Sep 18 09:42:54 UTC 2009
Module: Mesa
Branch: glsl-pp-rework-2
Commit: 5f9f30a75268bf6803627930ce982aede2c870f5
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f9f30a75268bf6803627930ce982aede2c870f5
Author: Michal Krol <michal at vmware.com>
Date: Fri Sep 18 11:20:42 2009 +0200
glsl/apps: Use glsl pp public interface.
---
src/glsl/apps/process.c | 42 ++++++++++++++++++++----------------------
src/glsl/apps/purify.c | 2 +-
src/glsl/apps/tokenise.c | 21 ++++++++++-----------
src/glsl/apps/version.c | 22 +++++++++++-----------
4 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/src/glsl/apps/process.c b/src/glsl/apps/process.c
index 678b100..1fdb096 100644
--- a/src/glsl/apps/process.c
+++ b/src/glsl/apps/process.c
@@ -28,10 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
-#include "../pp/sl_pp_context.h"
-#include "../pp/sl_pp_purify.h"
-#include "../pp/sl_pp_version.h"
-#include "../pp/sl_pp_process.h"
+#include "../pp/sl_pp_public.h"
int
@@ -43,7 +40,7 @@ main(int argc,
char *inbuf;
struct sl_pp_purify_options options;
char *outbuf;
- struct sl_pp_context context;
+ struct sl_pp_context *context;
struct sl_pp_token_info *tokens;
unsigned int version;
unsigned int tokens_eaten;
@@ -103,7 +100,8 @@ main(int argc,
free(inbuf);
- if (sl_pp_context_init(&context)) {
+ context = sl_pp_context_create();
+ if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(outbuf);
@@ -111,10 +109,10 @@ main(int argc,
return 1;
}
- if (sl_pp_tokenise(&context, outbuf, &tokens)) {
- fprintf(out, "$ERROR: `%s'\n", context.error_msg);
+ if (sl_pp_tokenise(context, outbuf, &tokens)) {
+ fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
- sl_pp_context_destroy(&context);
+ sl_pp_context_destroy(context);
free(outbuf);
fclose(out);
return 1;
@@ -122,19 +120,19 @@ main(int argc,
free(outbuf);
- if (sl_pp_version(&context, tokens, &version, &tokens_eaten)) {
- fprintf(out, "$ERROR: `%s'\n", context.error_msg);
+ if (sl_pp_version(context, tokens, &version, &tokens_eaten)) {
+ fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
- sl_pp_context_destroy(&context);
+ sl_pp_context_destroy(context);
free(tokens);
fclose(out);
return -1;
}
- if (sl_pp_process(&context, &tokens[tokens_eaten], &outtokens)) {
- fprintf(out, "$ERROR: `%s'\n", context.error_msg);
+ if (sl_pp_process(context, &tokens[tokens_eaten], &outtokens)) {
+ fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
- sl_pp_context_destroy(&context);
+ sl_pp_context_destroy(context);
free(tokens);
fclose(out);
return -1;
@@ -329,11 +327,11 @@ main(int argc,
break;
case SL_PP_IDENTIFIER:
- fprintf(out, "%s ", sl_pp_context_cstr(&context, outtokens[i].data.identifier));
+ fprintf(out, "%s ", sl_pp_context_cstr(context, outtokens[i].data.identifier));
break;
case SL_PP_NUMBER:
- fprintf(out, "%s ", sl_pp_context_cstr(&context, outtokens[i].data.number));
+ fprintf(out, "%s ", sl_pp_context_cstr(context, outtokens[i].data.number));
break;
case SL_PP_OTHER:
@@ -349,19 +347,19 @@ main(int argc,
break;
case SL_PP_EXTENSION_REQUIRE:
- fprintf(out, "#extension %s : require", sl_pp_context_cstr(&context, outtokens[i].data.extension));
+ fprintf(out, "#extension %s : require", sl_pp_context_cstr(context, outtokens[i].data.extension));
break;
case SL_PP_EXTENSION_ENABLE:
- fprintf(out, "#extension %s : enable", sl_pp_context_cstr(&context, outtokens[i].data.extension));
+ fprintf(out, "#extension %s : enable", sl_pp_context_cstr(context, outtokens[i].data.extension));
break;
case SL_PP_EXTENSION_WARN:
- fprintf(out, "#extension %s : warn", sl_pp_context_cstr(&context, outtokens[i].data.extension));
+ fprintf(out, "#extension %s : warn", sl_pp_context_cstr(context, outtokens[i].data.extension));
break;
case SL_PP_EXTENSION_DISABLE:
- fprintf(out, "#extension %s : disable", sl_pp_context_cstr(&context, outtokens[i].data.extension));
+ fprintf(out, "#extension %s : disable", sl_pp_context_cstr(context, outtokens[i].data.extension));
break;
case SL_PP_LINE:
@@ -377,7 +375,7 @@ main(int argc,
}
}
- sl_pp_context_destroy(&context);
+ sl_pp_context_destroy(context);
free(outtokens);
fclose(out);
diff --git a/src/glsl/apps/purify.c b/src/glsl/apps/purify.c
index d4c5370..435bdbe 100644
--- a/src/glsl/apps/purify.c
+++ b/src/glsl/apps/purify.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "../pp/sl_pp_purify.h"
+#include "../pp/sl_pp_public.h"
int
diff --git a/src/glsl/apps/tokenise.c b/src/glsl/apps/tokenise.c
index 1746e20..2b3ebcf 100644
--- a/src/glsl/apps/tokenise.c
+++ b/src/glsl/apps/tokenise.c
@@ -28,9 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
-#include "../pp/sl_pp_context.h"
-#include "../pp/sl_pp_purify.h"
-#include "../pp/sl_pp_token.h"
+#include "../pp/sl_pp_public.h"
int
@@ -42,7 +40,7 @@ main(int argc,
char *inbuf;
struct sl_pp_purify_options options;
char *outbuf;
- struct sl_pp_context context;
+ struct sl_pp_context *context;
struct sl_pp_token_info *tokens;
FILE *out;
unsigned int i;
@@ -99,7 +97,8 @@ main(int argc,
free(inbuf);
- if (sl_pp_context_init(&context)) {
+ context = sl_pp_context_create();
+ if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(outbuf);
@@ -107,10 +106,10 @@ main(int argc,
return 1;
}
- if (sl_pp_tokenise(&context, outbuf, &tokens)) {
- fprintf(out, "$ERROR: `%s'\n", context.error_msg);
+ if (sl_pp_tokenise(context, outbuf, &tokens)) {
+ fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
- sl_pp_context_destroy(&context);
+ sl_pp_context_destroy(context);
free(outbuf);
fclose(out);
return 1;
@@ -312,11 +311,11 @@ main(int argc,
break;
case SL_PP_IDENTIFIER:
- fprintf(out, "%s ", sl_pp_context_cstr(&context, tokens[i].data.identifier));
+ fprintf(out, "%s ", sl_pp_context_cstr(context, tokens[i].data.identifier));
break;
case SL_PP_NUMBER:
- fprintf(out, "(%s) ", sl_pp_context_cstr(&context, tokens[i].data.number));
+ fprintf(out, "(%s) ", sl_pp_context_cstr(context, tokens[i].data.number));
break;
case SL_PP_OTHER:
@@ -332,7 +331,7 @@ main(int argc,
}
}
- sl_pp_context_destroy(&context);
+ sl_pp_context_destroy(context);
free(tokens);
fclose(out);
diff --git a/src/glsl/apps/version.c b/src/glsl/apps/version.c
index 50c564b..f259431 100644
--- a/src/glsl/apps/version.c
+++ b/src/glsl/apps/version.c
@@ -28,8 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
-#include "../pp/sl_pp_purify.h"
-#include "../pp/sl_pp_version.h"
+#include "../pp/sl_pp_public.h"
int
@@ -41,7 +40,7 @@ main(int argc,
char *inbuf;
struct sl_pp_purify_options options;
char *outbuf;
- struct sl_pp_context context;
+ struct sl_pp_context *context;
struct sl_pp_token_info *tokens;
unsigned int version;
unsigned int tokens_eaten;
@@ -99,7 +98,8 @@ main(int argc,
free(inbuf);
- if (sl_pp_context_init(&context)) {
+ context = sl_pp_context_create();
+ if (!context) {
fprintf(out, "$CONTEXERROR\n");
free(outbuf);
@@ -107,10 +107,10 @@ main(int argc,
return 1;
}
- if (sl_pp_tokenise(&context, outbuf, &tokens)) {
- fprintf(out, "$ERROR: `%s'\n", context.error_msg);
+ if (sl_pp_tokenise(context, outbuf, &tokens)) {
+ fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
- sl_pp_context_destroy(&context);
+ sl_pp_context_destroy(context);
free(outbuf);
fclose(out);
return 1;
@@ -118,16 +118,16 @@ main(int argc,
free(outbuf);
- if (sl_pp_version(&context, tokens, &version, &tokens_eaten)) {
- fprintf(out, "$ERROR: `%s'\n", context.error_msg);
+ if (sl_pp_version(context, tokens, &version, &tokens_eaten)) {
+ fprintf(out, "$ERROR: `%s'\n", sl_pp_context_error_message(context));
- sl_pp_context_destroy(&context);
+ sl_pp_context_destroy(context);
free(tokens);
fclose(out);
return -1;
}
- sl_pp_context_destroy(&context);
+ sl_pp_context_destroy(context);
free(tokens);
fprintf(out,
More information about the mesa-commit
mailing list