Changeset aef58ba6ff1f23f0533a4c896a3f71ac64fff84d

Timestamp:

05/10/10 17:03:24 (2 years ago)

Author:

Philip Herron <redbrain@…>

Parents:

2d482ecb0a2abf82199a1f7c2350125d362c000f

Children:

d375779d1d4dfca413cc875bbe88abbdbf171a17

git-committer:

Philip Herron <redbrain@alpha.(none)> / 2010-05-10T17:03:24Z+0100

Message:

cleanup added autoconf check for libpcre3-dev for perl compatible regex semantics

Files:

• README (modified) (1 diff)
• configure.ac (modified) (5 diffs)
• src/rr_context.c (modified) (1 diff)
• src/rr_runtime.c (modified) (1 diff)

README

@@ -19 +19 @@
 Debian/Ubuntu:
  % aptitude install build-essential bison flex autoconf \
-  automake libtool libgmp3-dev libmpfr-dev libreadline5-dev
+  automake libtool libgmp3-dev libmpfr-dev libreadline5-dev \
+  libpcre3-dev
 
 openSuse:
- % yast -i gcc bison flex mpfr-devel gmp-devel 
+ % yast -i gcc bison flex mpfr-devel gmp-devel pcre-devel
  #autoconf stuff too
 

configure.ac

@@ -80 +80 @@
 AC_CANONICAL_HOST
 
-AC_ARG_WITH(include,
-  [AS_HELP_STRING([--with-include=<inc dir>],
-    [external include dir for headers, default null!])],
-  [xinclude="$withval"])
-if test "x$xinclude" != "x"; then
-   CFLAGS="$CFLAGS -I$xinclude"
-else
-   xinclude="none"
-fi
-
-AC_ARG_WITH(lib,
-  [AS_HELP_STRING([--with-lib=<lib dir>],
-    [external lib dir for libraries, default null!])],
-  [xlib="$withval"])
-if test "x$xlib" != "x"; then
-   LDFLAGS="$LDFLAGS -L$xlib"
-else
-   xlib="none"
-fi
-
-CFLAGS_save="$CFLAGS"
-CFLAGS=""
+
+# CFLAGS_save="$CFLAGS"
+# CFLAGS="$"
 
 xpkgs=""
@@ -160 +141 @@
   [AC_MSG_ERROR([MPFR not found, see http://www.mpfr.org/])])
 AC_CHECK_SIZEOF(mp_limb_t, , [#include <gmp.h>])
+
+AC_CHECK_LIB([pcre], [pcre_compile], ,
+  [AC_MSG_ERROR([Libpcre3 - Perl Regex not found. \
+On Debfian can be found via libpcre3-dev])])
 
 VL_LIB_READLINE
@@ -226 +211 @@
 AC_CHECK_SIZEOF(long long)
 AC_CHECK_SIZEOF(crl_symbol_obj, , \
-  [#include "crules/symbols.h"])
+  [#include "include/crules/symbols.h"])
 
 # Checks for header files.
@@ -235 +220 @@
                   stdint.h stdio.h getopt.h \
                   assert.h sys/types.h signal.h \
-                  fcntl.h pthread.h sys/wait.h])
+                  fcntl.h pthread.h sys/wait.h \
+                  gmp.h mpfr.h pcre.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -269 +255 @@
 echo "   * LEX version:               $LEX"
 echo "   * Perl support:              $XPERL"
-echo "   * External include dir:      $xinclude"
-echo "   * External lib dir           $xlib"
-echo "   * Multi-Precision:           yes"
+echo "   * GMP & MPFR support:        yes"
+echo "   * Perl Regex Support:        yes"
 echo "   * POSIX pthreads:            $pthread"
 echo "   * DEBUG Symbols:             $debug"

src/rr_context.c

@@ -265 +265 @@
           crl_error("problem assigning '%s'!\n", functor->identifier );
           retval = false;
-        } 
+        }
     }
   else

src/rr_runtime.c

@@ -979 +979 @@
               unsigned int idx= 0;
 
-              crl_symbol_obj *arg_idx= NULL; char *param_idx= NULL;
+              crl_symbol_obj *arg_idx= NULL;
+              crl_symbol_obj *param_idx= NULL;
               while( idx < n_parameters )
                 {
-                  arg_idx= (crl_symbol_obj *) args[ idx ];
-                  param_idx= (char *) params[ idx ]; idx++;
-
-                  crl_debug("assigning parameter <%s>!\n", param_idx );
+                  arg_idx = (crl_symbol_obj*) args[ idx ];
+                  param_idx = (crl_symbol_obj*) params[ idx ];
+                  idx++;
+
+                  crl_debug("assigning parameter <%s>!\n", param_idx->op_a.string );
                   crl_symbol_obj* o= crl_runtime_evaluate_expression( arg_idx, arg_ctx );
                   crl_assert( o->type == SYMBOL_PRIMARY );
 
-                  crl_symbol_obj** s= crl_dd_hash_insert( crl_dd_hash_hash( param_idx ) ,
+                  if( param_idx->op_b_t != TYPE_SYMBOL_NIL )
+                    {
+                      crl_assert( o->op_a_t == TYPE_OBJECT );
+                      struct crl_obj_state_t * os = o->op_a.object_state;
+                      printf("os->identifier = <%s>!\n", os->identifier);
+
+                      switch( param_idx->op_b_t )
+                        {
+                        case TYPE_OBJECT:
+                          // already passed the assertion!
+                          break;
+
+                        case TYPE_INTEGER:
+                          if( strcmp( "Int", os->identifier ) )
+                            {
+                              crl_fatal("parameter '%s' is of type <Int> but argument is <%s>!\n",
+                                        param_idx->op_a.string, os->identifier );
+                            }
+                          break;
+
+                        case TYPE_FLOAT:
+                          if( strcmp( "Float", os->identifier ) )
+                            {
+                              crl_fatal("parameter '%s' is of type <Float> but argument is <%s>!\n",
+                                        param_idx->op_a.string, os->identifier );
+                            }
+                          break;
+
+                        default:
+                          crl_fatal("unhandled opcode <0x%X>!\n", param_idx->op_b_t );
+                          break;
+                        }
+                    }
+
+                  crl_symbol_obj** s= crl_dd_hash_insert( crl_dd_hash_hash( param_idx->op_a.string ) ,
                                                           o , function_ctx->curr->symbol_table );
                   if( s )