Use yy_scan_string and stop caring about shader->SourceLen.

We had to call strlen on the preprocessed source, which seemed a bit
pointless; also, we updated shader->SourceLen but not shader->Source,
which was even more confusing.  Just leave both untouched.

diff --git a/glcpp/pp.c b/glcpp/pp.c
index eaca4819ce54c119806a8c62a3e0c80b6979debf..e6921db46b58ef61ab80033df0f4cf52c66318a1 100644 (file)
--- a/glcpp/pp.c
+++ b/glcpp/pp.c
@@ -57,7 +57,7 @@ glcpp_warning (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)
 }
 
 extern int
-preprocess(void *talloc_ctx, const char **shader, size_t *shader_len)
+preprocess(void *talloc_ctx, const char **shader)
 {
        int errors;
        glcpp_parser_t *parser = glcpp_parser_create ();
@@ -69,7 +69,6 @@ preprocess(void *talloc_ctx, const char **shader, size_t *shader_len)
 
        talloc_steal(talloc_ctx, parser->output);
        *shader = parser->output;
-       *shader_len = strlen(parser->output);
 
        errors = parser->error;
        glcpp_parser_destroy (parser);

diff --git a/glsl_lexer.lpp b/glsl_lexer.lpp
index cd150f81ca11ba828aac956f53d618757735b96b..9a3037a8ff569500ac7a0453dbeecb4cd16b7b36 100644 (file)
--- a/glsl_lexer.lpp
+++ b/glsl_lexer.lpp
@@ -330,11 +330,10 @@ precision return PRECISION;
 %%
 
 void
-_mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state,
-                     const char *string, size_t len)
+_mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state, const char *string)
 {
    yylex_init_extra(state, & state->scanner);
-   yy_scan_bytes(string, len, state->scanner);
+   yy_scan_string(string, state->scanner);
 }
 
 void

diff --git a/glsl_parser_extras.h b/glsl_parser_extras.h
index cad3424f6bddec3a453b1f7004de185fe26d995d..1edd86bc6ea56c4d8f62c9efb0845e8088594f69 100644 (file)
--- a/glsl_parser_extras.h
+++ b/glsl_parser_extras.h
@@ -102,11 +102,11 @@ extern void _mesa_glsl_warning(const YYLTYPE *locp,
                               const char *fmt, ...);
 
 extern "C" {
-extern int preprocess(void *ctx, const char **shader, size_t *shader_len);
+extern int preprocess(void *ctx, const char **shader);
 }
 
 extern void _mesa_glsl_lexer_ctor(struct _mesa_glsl_parse_state *state,
-                                 const char *string, size_t len);
+                                 const char *string);
 
 extern void _mesa_glsl_lexer_dtor(struct _mesa_glsl_parse_state *state);
 

diff --git a/main.cpp b/main.cpp
index 58657fe20125b0365578e286179fa2d86506a1b6..25904380c9560ba9bcc88470e3d92b6949e06998 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -128,10 +128,10 @@ compile_shader(struct glsl_shader *shader)
     * should probably be the parser context, but there isn't one yet.
    */
    const char *source = shader->Source;
-   state.error = preprocess(shader, &source, &shader->SourceLen);
+   state.error = preprocess(shader, &source);
 
    if (!state.error) {
-      _mesa_glsl_lexer_ctor(& state, source, shader->SourceLen);
+      _mesa_glsl_lexer_ctor(& state, source);
       _mesa_glsl_parse(& state);
       _mesa_glsl_lexer_dtor(& state);
    }