Changeset 214fc9d7a7c8ed9ee8fd8b8c51b19287374157e8

Timestamp:

03/03/10 03:10:36 (2 years ago)

Author:

Philip Herron <redbrain@…>

Parents:

f72fb404911ac4d42b7d10d62e462db348645527

Children:

a6d31aec35d85c450d6b3d485dcd9b3ac9070afc

git-committer:

Philip Herron <redbrain@omicron.(none)> / 2010-03-03T03:10:36Z+0000

Message:

basic cmake support

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/FindBISON.cmake (moved) (moved from cmake/FindBison.cmake)
• cmake/FindFLEX.cmake (moved) (moved from cmake/FindFlex.cmake)
• configure.ac (modified) (3 diffs)
• src/CMakeLists.txt (modified) (1 diff)
• src/config.h.in.cmake (modified) (1 diff)
• src/mm_crules.c (modified) (2 diffs)
• src/ss_lexical.l (modified) (4 diffs)
• src/ss_parser.y (modified) (3 diffs)

CMakeLists.txt

@@ -2 +2 @@
 cmake_minimum_required(VERSION 2.6)
 add_subdirectory(src)
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
-set (Crules_VERSION 0.44)
 
+FIND_PATH(READLINE_INCLUDE_DIR readline/readline.h)
+FIND_LIBRARY(READLINE_LIBRARY NAMES readline)
+
+IF (READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
+SET(READLINE_FOUND TRUE)
+ENDIF (READLINE_INCLUDE_DIR AND READLINE_LIBRARY)
+
+IF (READLINE_FOUND)
+IF (NOT Readline_FIND_QUIETLY)
+MESSAGE(STATUS "Found GNU readline: ${READLINE_LIBRARY}")
+ENDIF (NOT Readline_FIND_QUIETLY)
+ELSE (READLINE_FOUND)
+IF (Readline_FIND_REQUIRED)
+MESSAGE(FATAL_ERROR "Could not find GNU readline")
+ENDIF (Readline_FIND_REQUIRED)
+ENDIF (READLINE_FOUND)
+
+set(CMAKE_MODULE_PATH "cmake/")
 find_package(BISON)
 find_package(FLEX)
 
-BISON_TARGET(MyParser ss_parser.y src/ss_parser.c)
-FLEX_TARGET(MyScanner ss_lexical.l src/ss_lexical.c)
+BISON_TARGET(MyParser src/ss_parser.y src/ss_parser.c)
+FLEX_TARGET(MyScanner src/ss_lexical.l src/ss_lexical.c)
 ADD_FLEX_BISON_DEPENDENCY(MyScanner MyParser)
 
+include_directories (include)
+ADD_LIBRARY(parser STATIC 
+  ${BISON_MyParser_OUTPUTS}
+  ${FLEX_MyScanner_OUTPUTS}
+  )
+
+set (Crules_VERSION 0.44)
 # does this system provide the log and exp functions?
 include (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)

configure.ac

@@ -226 +226 @@
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stdlib.h string.h stdarg.h unistd.h \
-                                             stdint.h stdio.h getopt.h \
-                                             assert.h sys/types.h signal.h \
-                                             fcntl.h pthread.h sys/wait.h])
+                  stdint.h stdio.h getopt.h \
+                  assert.h sys/types.h signal.h \
+                  fcntl.h pthread.h sys/wait.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -235 +235 @@
 AC_TYPE_SIZE_T
 AC_CHECK_FUNCS([popen fopen fclose sprintf fprintf strdup \
-                                  strlen strcpy strcmp getopt_long \
-                                  memcpy calloc system sysconf atoi \
-                                  getpid execl fork wait exit atof \
-                                  vfprintf memcmp getc fgets pipe \
-                                  waitpid fdopen])
+                strlen strcpy strcmp getopt_long \
+                memcpy calloc system sysconf atoi \
+                getpid execl fork wait exit atof \
+                vfprintf memcmp getc fgets pipe \
+                waitpid fdopen])
 
 # Checks for library functions.
@@ -248 +248 @@
                  include/Makefile
                  src/Makefile
-                             tests/Makefile
+                 tests/Makefile
                  config/pkg-config/crules.pc])
 AC_OUTPUT

src/CMakeLists.txt

@@ -1 +1 @@
 include_directories (../include)
-add_executable( crules mm_crules.c bb_backend.c bb_signals.c builtin_call_table.c builtin_hash_table.c builtin_stack.c gg_garbage.c object_class.c object_list.c object_number.c object_string.c rr_bin_eval.c rr_context.c rr_runtime.c ss_eval.c )
+add_executable( crules
+  mm_crules.c
+  bb_backend.c
+  bb_signals.c
+  builtin_call_table.c
+  builtin_hash_table.c
+  builtin_stack.c
+  gg_garbage.c
+  object_class.c
+  object_list.c
+  object_number.c
+  object_string.c
+  rr_bin_eval.c
+  rr_context.c
+  rr_runtime.c
+  ss_eval.c 
+)
+
+TARGET_LINK_LIBRARIES( crules parser )

src/config.h.in.cmake

@@ -1 +1 @@
 // the configured options and settings for Tutorial
-#define VERSION @Crules_VERSION@
+#define VERSION "@Crules_VERSION@"

src/mm_crules.c

@@ -77 +77 @@
       //print the header messages :)
       time_t lt= time( NULL );
-#ifndef CMAKE
       fprintf( stdout, "Crules %s - ", VERSION );
       fprintf( stdout, "%s", ctime( &lt ) );
+#ifndef CMAKE
       fprintf( stdout, "[ %s:%s ( %s:%s ) ]\n", CONFIG_CC,
                CONFIG_CC_VER, SYSTEM_TYPE,  MACHINE_TYPE );
-#else
-      fprintf( stdout, "Crules %f - ", VERSION );
-      fprintf( stdout, "%s", ctime( &lt ) );
 #endif
       err= crl_parse( stdin );
@@ -99 +96 @@
 void print_version( void )
 {
-#ifndef CMAKE
   fprintf( crlout, "Crules interpreter version: %s\n", VERSION );
   fprintf( crlout, "Copyright (c) Philip Herron 2009-2010\n" );
+#ifndef CMAKE
   fprintf( crlout, "Compiled for: %s %s\n", SYSTEM_TYPE, MACHINE_TYPE );
   fprintf( crlout, "Report suggestions and bugs to: %s\n", PACKAGE_BUGREPORT );
-#else
-  fprintf( stdout, "Crules interpreter version: %f\n", VERSION );
-  fprintf( crlout, "Copyright (c) Philip Herron 2009-2010\n" );
 #endif
   fprintf( crlout, "\nThis is free software; see the source for copying conditions.  There is NO\n" );

src/ss_lexical.l

@@ -33 +33 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
-#endif
+#else
+# define CMAKE 1
+# include "config.h.cmake"
+#endif
+
+#define LINE_MAX 256
 
 #include <crules/crules.h>
@@ -41 +46 @@
 #include <crules/backend.h>
 
-#include "libparser_a-ss_parser.h"
+#ifndef CMAKE
+# include "libparser_a-ss_parser.h"
+#else
+# include "ss_parser.h"
+#endif
 
 #ifdef HAVE_LIBREADLINE
@@ -216 +225 @@
   if( fin == stdin )
     {
-      const char *prompt= ">>> ";
+      YY_BUFFER_STATE bp; const char * prompt= ">>> ";
 #ifdef HAVE_LIBREADLINE
-      char *line;
-#else
-      char line[256];
-#endif
-      YY_BUFFER_STATE bp;
+      char *line= NULL;
       while( 1 )
-        {
-#ifdef HAVE_LIBREADLINE
-          line= readline( prompt );
-#else
-          fprintf( stdout, "%s", prompt );
-          fgets( line, sizeof(line), stdin );
-#endif
-          crl_lexer_mark_string( line );
-
-          if( line == 0 )
+        {
+          line= readline( prompt );
+          crl_lexer_mark_string( line );
+          
+          if( line == 0 )
             break;
           else if( crl_strlen( line ) > 0 )
@@ -245 +245 @@
               yy_delete_buffer( bp );
             }
-        }
+        }
+#else
+      char line[LINE_MAX];
+      fprintf( stdout, "%s", prompt );
+      while( fgets(line, LINE_MAX, stdin) != NULL )
+        {
+          bp= yy_scan_string( line );
+          yy_switch_to_buffer( bp );
+          err= yyparse( );
+          yy_delete_buffer( bp );
+          fprintf( stdout, "%s", prompt );
+        }
+#endif
     }
   else

src/ss_parser.y

@@ -32 +32 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
+#else
+# define CMAKE 1
+# include "config.h.cmake"
 #endif
 
@@ -112 +115 @@
 %type<symbol> procedure
 %type<stack> parameters
-%type<stack> iterators
 %type<list> list_symbol
 %type<stack> arguments
@@ -490 +492 @@
         ;
 
-iterators: parameters
-        ;
-
-loop_for: FOR '(' expression expression expression ')' '{' procedure '}'
+
+loop_for: FOR '(' ')' '{' procedure '}'
         {
           $$= NULL;