add a function to get lex ver

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@138 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/Client/main.c b/Client/main.c
index 17f5967e2ae4c2c333dc6e5a087e236406a36910..7d73307d9599763d2cbf3812709b5d6c1fefa744 100644 (file)
--- a/Client/main.c
+++ b/Client/main.c
@@ -125,6 +125,7 @@ int main(int argc, char** argv) {
        if(banner) {
                printf("DataWorks  version %s  %s %s\n", dataworks_get_version(), dataworks_get_compile_date(), dataworks_get_platform());
                printf("Using Yacc: %s\n", dataworks_get_yacc_version());
+               printf("       Lex: %s\n", dataworks_get_lex_version());
                if(dataworks_get_endian() == 'L') {
                        printf("This system is little-endian.\n");
                } else {

diff --git a/Grammar/dw.l b/Grammar/dw.l
index 8f369e263f314b2ed4f1a3d7d2faa9c06fd9a763..99c52173705145c4a888352cba420ffa1e59360c 100644 (file)
--- a/Grammar/dw.l
+++ b/Grammar/dw.l
@@ -55,3 +55,13 @@ extern YYSTYPE yylval;
 [ \t\v]*               {
        return (SPACE);
 }
+
+%%
+
+#if defined(FLEX_SCANNER)
+#define XSTR(x) #x
+#define STR(x) XSTR(x)
+const char* lexver = "Flex " STR(YY_FLEX_MAJOR_VERSION) "." STR(YY_FLEX_MINOR_VERSION) "." STR(YY_FLEX_SUBMINOR_VERSION);
+#else
+const char* lexver = "Unknown";
+#endif

diff --git a/Grammar/dw.y b/Grammar/dw.y
index 6bf4052121e399091860f27ea06de5b4a9468e25..fe279a9928a624e8c6cf7d666cd45d3747e09cac 100644 (file)
--- a/Grammar/dw.y
+++ b/Grammar/dw.y
@@ -76,4 +76,6 @@ const char* yaccver = "GNU Bison " YYBISON_VERSION;
 #define XSTR(x) #x
 #define STR(x) XSTR(x)
 const char* yaccver = "Berkeley Yacc " STR(YYMAJOR) "." STR(YYMINOR);
+#else
+const char* yaccver = "Unknown";
 #endif

diff --git a/Library/dataworks.c b/Library/dataworks.c
index ef2afed154c98b2e999f44f01283acf9d2a3d3b4..4058122395a6ca9c1f872ace216b7e343fe6632d 100644 (file)
--- a/Library/dataworks.c
+++ b/Library/dataworks.c
@@ -54,9 +54,11 @@ const char* dataworks_platform = "Unknown/"
     PLATFORM_M " (" PLATFORM_P ")";
 
 extern const char* yaccver;
+extern const char* lexver;
 
 const char* dataworks_get_version(void) { return dataworks_version; }
 const char* dataworks_get_yacc_version(void) { return yaccver; }
+const char* dataworks_get_lex_version(void) { return lexver; }
 const char* dataworks_get_compile_date(void) { return dataworks_compile_date; }
 const char* dataworks_get_platform(void) { return dataworks_platform; }
 char dataworks_get_endian(void) {

diff --git a/Library/dataworks.h b/Library/dataworks.h
index f76073e2143ee8c5bd0457a51765af75c7bc692b..673e5958ce026a9fc67278141cc1cc9d23ded77b 100644 (file)
--- a/Library/dataworks.h
+++ b/Library/dataworks.h
@@ -58,6 +58,14 @@ const char* dataworks_get_version(void);
  */
 const char* dataworks_get_yacc_version(void);
 
+/**
+ * @~english
+ * @brief Get the version of Lex used by DataWorks
+ * @return Lex version of DataWorks
+ *
+ */
+const char* dataworks_get_lex_version(void);
+
 /**
  * @~english
  * @brief Get the compilation date of DataWorks

diff --git a/common.mk b/common.mk
index 2c27310af8d6f96894a63a210b62cc370ec16f64..fd0c45c56a2f4b315cc77b797595a2c315e60115 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -81,6 +81,7 @@ prepare-dosbox: no-doc
        echo "c:" >> dosbox.conf
        echo "copy Client\*$(EXEC_SUFFIX) dw$(EXEC_SUFFIX)" >> dosbox.conf
        echo "dw /NC /f op.txt /create db.dwf" >> dosbox.conf
+       echo "dw /NC /f op.txt db.dwf" >> dosbox.conf
        echo "pause" >> dosbox.conf
        echo "del db.dwf" >> dosbox.conf
        echo "del dw.exe" >> dosbox.conf