glsl: Implement `line' preprocessor directive.

4 files changed, 108 insertions, 1 deletions

diff --git a/src/glsl/pp/SConscript b/src/glsl/pp/SConscript
index dae8830eeb6..cc930380c21 100644
--- a/src/glsl/pp/SConscript
+++ b/src/glsl/pp/SConscript
@@ -14,6 +14,7 @@ glsl = env.StaticLibrary(
         'sl_pp_expression.c',
         'sl_pp_extension.c',
         'sl_pp_if.c',
+        'sl_pp_line.c',
         'sl_pp_macro.c',
         'sl_pp_pragma.c',
         'sl_pp_process.c',
diff --git a/src/glsl/pp/sl_pp_line.c b/src/glsl/pp/sl_pp_line.c
new file mode 100644
index 00000000000..3300a4785ba
--- /dev/null
+++ b/src/glsl/pp/sl_pp_line.c
@@ -0,0 +1,95 @@
+/**************************************************************************
+ * 
+ * Copyright 2009 VMware, Inc.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+#include <stdlib.h>
+#include "sl_pp_process.h"
+
+
+int
+sl_pp_process_line(struct sl_pp_context *context,
+                   const struct sl_pp_token_info *input,
+                   unsigned int first,
+                   unsigned int last)
+{
+   unsigned int i;
+   struct sl_pp_process_state state;
+   int line_number = -1;
+   int file_number = -1;
+
+   memset(&state, 0, sizeof(state));
+   for (i = first; i < last;) {
+      switch (input[i].token) {
+      case SL_PP_WHITESPACE:
+         i++;
+         break;
+
+      case SL_PP_IDENTIFIER:
+         if (sl_pp_macro_expand(context, input, &i, NULL, &state, 0)) {
+            free(state.out);
+            return -1;
+         }
+         break;
+
+      default:
+         if (sl_pp_process_out(&state, &input[i])) {
+            free(state.out);
+            return -1;
+         }
+         i++;
+      }
+   }
+
+   if (state.out_len > 0 && state.out[0].token == SL_PP_NUMBER) {
+      line_number = state.out[0].data.number;
+   } else {
+      strcpy(context->error_msg, "expected number after `#line'");
+      free(state.out);
+      return -1;
+   }
+
+   if (state.out_len > 1) {
+      if (state.out[1].token == SL_PP_NUMBER) {
+         file_number = state.out[1].data.number;
+      } else {
+         strcpy(context->error_msg, "expected number after line number");
+         free(state.out);
+         return -1;
+      }
+
+      if (state.out_len > 2) {
+         strcpy(context->error_msg, "expected end of line after file number");
+         free(state.out);
+         return -1;
+      }
+   }
+
+   free(state.out);
+
+   /* TODO: Do something with line and file numbers. */
+
+   return 0;
+}
diff --git a/src/glsl/pp/sl_pp_process.c b/src/glsl/pp/sl_pp_process.c
index 18289790d19..5479e8a8683 100644
--- a/src/glsl/pp/sl_pp_process.c
+++ b/src/glsl/pp/sl_pp_process.c
@@ -155,6 +155,10 @@ sl_pp_process(struct sl_pp_context *context,
                      if (sl_pp_process_extension(context, input, first, last, &state)) {
                         return -1;
                      }
+                  } else if (!strcmp(name, "line")) {
+                     if (sl_pp_process_line(context, input, first, last)) {
+                        return -1;
+                     }
                   } else if (!strcmp(name, "pragma")) {
                      if (sl_pp_process_pragma(context, input, first, last, &state)) {
                         return -1;
@@ -164,7 +168,8 @@ sl_pp_process(struct sl_pp_context *context,
                         return -1;
                      }
                   } else {
-                     /* XXX: Ignore. */
+                     strcpy(context->error_msg, "unrecognised directive name");
+                     return -1;
                   }
                }
 
diff --git a/src/glsl/pp/sl_pp_process.h b/src/glsl/pp/sl_pp_process.h
index 58918665434..6f90fbd3e77 100644
--- a/src/glsl/pp/sl_pp_process.h
+++ b/src/glsl/pp/sl_pp_process.h
@@ -113,6 +113,12 @@ sl_pp_process_extension(struct sl_pp_context *context,
                         struct sl_pp_process_state *state);
 
 int
+sl_pp_process_line(struct sl_pp_context *context,
+                   const struct sl_pp_token_info *input,
+                   unsigned int first,
+                   unsigned int last);
+
+int
 sl_pp_process_out(struct sl_pp_process_state *state,
                   const struct sl_pp_token_info *token);