Most of the tries ported

Author: Marc-Oliver Gewaltig

base.mk

@@ -20,11 +20,10 @@
 #CXX=g++-mp-4.6
 CC=clang
 CXX=clang
+
 GDB=-g
 CCFLAGS= -O2 $(GDB) -Wall
-#CXXFLAGS= -O3 $(GDB) -I/opt/local/include -Wall -pedantic
-
-CXXFLAGS= -O3 -Wall -pedantic
+CXXFLAGS= -O3 $(GDB) -Wall -pedantic
 
 ## Linker flags
 LDLIBS= -lstdc++

makefile

@@ -42,11 +42,8 @@ class TokenArray
   unsigned int alloc_block_size;
   unsigned int refs_;
 
-//  bool homogeneous;
-
   void allocate(size_t, size_t, size_t, const Token & = Token());
 
-
  public:
   static size_t allocations;
 

sli_array.h

@@ -181,6 +181,8 @@ namespace sli3
 	  order in which the lables in the enum typeid (sli_type.h) are
 	  defined.
 	*/
+	types_[sli3::nulltype]=(new OperatorType<sli3::nulltype>(this,"nulltype"));
+	types_[sli3::anytype]=(new OperatorType<sli3::anytype>(this,"anytype"));
 	types_[sli3::integertype]=(new IntegerType(this,"integertype",sli3::integertype));
 	types_[sli3::doubletype]=(new DoubleType(this,"doubletype",sli3::doubletype));
 	types_[sli3::booltype]=(new BoolType(this,"booltype",sli3::booltype));

sli_interpreter.cpp

@@ -26,7 +26,8 @@ namespace sli3
     class SLIString;
     class SLIistream;
     class SLIostream;
-    
+    class TypeNode;
+
     class Token
     {
     public:
@@ -56,7 +57,8 @@ namespace sli3
 	 * Exchange the contents of t and this token.
 	 */
 	Token & swap(Token &t);
-	
+
+
 	/**
 	 * Clear contents of token.
 	 * 
@@ -113,17 +115,18 @@ namespace sli3
 	SLIType *type_; //!< If NULL, the datum is unused.	
 	union value
 	{
-	  double double_val;
-	  long   long_val;   
-	  bool   bool_val;
-	  size_t  name_val;
-	  TokenArray *array_val;
-	  SLIFunction *func_val;
-	  Dictionary *dict_val;
-	  SLIString  *string_val;
-	  SLIistream *istream_val;
-	  SLIostream *ostream_val;
-	  TypeNode *trie_val;
+	    double double_val;
+	    long   long_val;   
+	    bool   bool_val;
+	    size_t  name_val;
+	    TokenArray *array_val;
+	    SLIFunction *func_val;
+	    Dictionary *dict_val;
+	    SLIString  *string_val;
+	    SLIistream *istream_val;
+	    SLIostream *ostream_val;
+	    TypeNode *trie_val;
+	    SLIType *type_val;
 	} data_;
     };
 

sli_token.h

@@ -14,54 +14,58 @@
  *
  */
 
-#ifndef SLITYPECHECK_H
-#define SLITYPECHECK_H
-#include <typeinfo>
-#include "slifunction.h"
+#ifndef SLI_TYPECHECK_H
+#define SLI_TYPECHECK_H
 
-class TrieFunction: public SLIFunction
-{
-public:
-  TrieFunction() {}
-    void execute(SLIInterpreter *) const;
-};
+#include "sli_function.h"
 
-class TrieInfoFunction: public SLIFunction
+namespace sli3
 {
-public:
-  TrieInfoFunction() {}
-  void execute(SLIInterpreter *) const;
-};
+  void init_slitypecheck(SLIInterpreter *);
 
-class AddtotrieFunction: public SLIFunction
-{
-public:
-AddtotrieFunction() {}
+  class TrieFunction: public SLIFunction
+  {
+  public:
+    TrieFunction() {}
     void execute(SLIInterpreter *) const;
-};
-
-class Cva_tFunction: public SLIFunction
-{
-public:
-Cva_tFunction() {}
+  };
+  
+  class TrieInfoFunction: public SLIFunction
+  {
+  public:
+    TrieInfoFunction() {}
     void execute(SLIInterpreter *) const;
-};
-
-class Cvt_aFunction: public SLIFunction
-{
-public:
-Cvt_aFunction() {}
+  };
+  
+  class AddtotrieFunction: public SLIFunction
+  {
+  public:
+    AddtotrieFunction() {}
     void execute(SLIInterpreter *) const;
-};
-
-class TypeFunction: public SLIFunction
-{
-public:
-TypeFunction() {}
+  };
+  
+  class Cva_tFunction: public SLIFunction
+  {
+  public:
+    Cva_tFunction() {}
     void execute(SLIInterpreter *) const;
-};
-
-
-void init_slitypecheck(SLIInterpreter *);
-
+  };
+  
+  class Cvt_aFunction: public SLIFunction
+  {
+  public:
+    Cvt_aFunction() {}
+    void execute(SLIInterpreter *) const;
+  };
+  
+  class TypeFunction: public SLIFunction
+  {
+  public:
+    TypeFunction() {}
+    void execute(SLIInterpreter *) const;
+  };
+  
+  
+}
 #endif
+  

sli_trie.h

@@ -1,7 +1,7 @@
 #ifndef SLI_TRIETYPE_H
 #define SLI_TRIETYPE_H
 #include "sli_type.h"
-#include "sli_trie.h"
+#include "sli_type_trie.h"
 #include <cassert>
 namespace sli3
 {

sli_trietype.h

@@ -2,6 +2,7 @@
 #ifndef SLI_TYPE_H
 #define SLI_TYPE_H
 #include "sli_name.h"
+
 namespace sli3
 {
 
@@ -19,7 +20,9 @@ namespace sli3
 
   enum sli_typeid
   {
-    integertype=0,
+    nulltype=0,  //!< used for unassigned type_id values
+    anytype,     //!< Used for typechecking only
+    integertype,
     doubletype,
     booltype,
     literaltype,
@@ -29,19 +32,20 @@ namespace sli3
     dictionarytype,
     nametype,
     litproceduretype,
+    trietype,      //!< Type Trie
     functiontype,
     proceduretype,
     iiteratetype,
     irepeattype,
     ifortype,
     iforalltype,
+    nooptype,
     quittype,
     symboltype,
-    num_sli_types,
-    trietype,
     istreamtype,
     xistreamtype,
     ostreamtype,
+    num_sli_types, //!< Number of builtin types. User type ids start here
     intvectortype,
     doublevectortype,
     iteratortype
@@ -99,6 +103,7 @@ namespace sli3
       return name_;
     }
 
+
     bool is_type(unsigned int id) const
     {
       return id_ == id;
@@ -120,6 +125,11 @@ namespace sli3
       return executable_;
     }
 
+    SLIInterpreter *get_interpreter() const
+    {
+      return sli_;
+    }
+
     virtual bool compare(Token const &t1, Token const& t2) const=0;
 
     virtual std::ostream& print(std::ostream &, const Token &) const;