[brlcad-commits] SF.net SVN: brlcad:[48044] brlcad/trunk/src/other/perplex/scanner_template. c

[<n_...@us...>]

Revision: 48044
          http://brlcad.svn.sourceforge.net/brlcad/?rev=48044&view=rev
Author:   n_reed
Date:     2011-12-19 16:51:26 +0000 (Mon, 19 Dec 2011)
Log Message:
-----------
typo

Modified Paths:
--------------
    brlcad/trunk/src/other/perplex/scanner_template.c

Modified: brlcad/trunk/src/other/perplex/scanner_template.c
===================================================================
--- brlcad/trunk/src/other/perplex/scanner_template.c	2011-12-19 16:41:39 UTC (rev 48043)
+++ brlcad/trunk/src/other/perplex/scanner_template.c	2011-12-19 16:51:26 UTC (rev 48044)
@@ -74,6 +74,7 @@
     char *tokenStart;
     struct Buf *buffer;
     char *tokenText;
+    void *extra;        /* application data */
 } *perplex_t;
 
 perplex_t perplexFileScanner(FILE *input);
@@ -84,25 +85,14 @@
 #define PERPLEX_LEXER yylex
 #endif
 
-#ifndef PERPLEX_APPDATA_PARAM
-#define PERPLEX_APPDATA_PARAM appData
-#endif
+#define PERPLEX_PUBLIC_LEXER  PERPLEX_LEXER(perplex_t scanner)
+#define PERPLEX_PRIVATE_LEXER PERPLEX_LEXER_private(perplex_t scanner)
 
-#ifndef PERPLEX_APPDATA_TYPE
-#  define PERPLEX_PUBLIC_LEXER         int PERPLEX_LEXER(perplex_t scanner)
-#  define PERPLEX_PRIVATE_LEXER static int PERPLEX_LEXER_private(perplex_t scanner)
-#  define PERPLEX_PARAMETERS    scanner
-#else
-#  define PERPLEX_PUBLIC_LEXER         int PERPLEX_LEXER(perplex_t scanner, PERPLEX_APPDATA_TYPE PERPLEX_APPDATA_PARAM)
-#  define PERPLEX_PRIVATE_LEXER static int PERPLEX_LEXER_private(perplex_t scanner, PERPLEX_APPDATA_TYPE PERPLEX_APPDATA_PARAM)
-#  define PERPLEX_PARAMETERS    scanner, PERPLEX_APPDATA_PARAM
-#endif
-
 #ifndef PERPLEX_ON_ENTER
 #define PERPLEX_ON_ENTER /* do nothing */
 #endif
 
-PERPLEX_PUBLIC_LEXER;
+int PERPLEX_PUBLIC_LEXER;
 
 %%
 /*              S C A N N E R _ T E M P L A T E . C
@@ -236,7 +226,7 @@
 struct Buf*
 buf_linedir(struct Buf *buf, const char* filename, int lineno)
 {
-    char *t,
+    char *t;
     char fmt[] = "#line %d \"%s\"\n";
     
     t = (char*)malloc(strlen(fmt) + strlen(filename) + (int)(1 + log10(lineno >= 0? lineno : -lineno)) + 1);
@@ -619,14 +609,15 @@
 #define YYFILL(n)          bufferFill(scanner, n)
 
 /* scanner */
-PERPLEX_PRIVATE_LEXER;
+static int PERPLEX_PRIVATE_LEXER;
 
+int
 PERPLEX_PUBLIC_LEXER {
     int ret;
 
     scanner->tokenText = NULL;
 
-    ret = PERPLEX_LEXER_private(PERPLEX_PARAMETERS);
+    ret = PERPLEX_LEXER_private(scanner);
 
     if (scanner->tokenText != NULL) {
 	free(scanner->tokenText);
@@ -636,6 +627,7 @@
     return ret;
 }
 
+static int
 PERPLEX_PRIVATE_LEXER {
     char yych;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.