Changeset 125 for trunk/include


Ignore:
Timestamp:
Nov 4, 2005, 3:19:11 PM (19 years ago)
Author:
dkearney
Message:

1) removed "as" string from c++'s element() function because
the function does not have the capacity to return anything
other than RpLibrary? Instances
2) changed get() functions in library module to return strings.
this change was propagated to matlab, octave, c, fortran, c++
bindings.
3) fixed rpFreeLibrary inside of c interface, now function accepts
a pointer to a pointer to RpLibrary? (lib) and sets *lib equal to
null
4) added doxygen target to makefile. (make docs), to get graphics
you need the program named dot (debian: apt-get install graphviz)
otherwise you will get errors for the portion of the proceedure
where it is trying to create the graphics.

Location:
trunk/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/cee/RpLibraryCInterface.h

    r115 r125  
    2222//
    2323RpLibrary*  rpLibrary             (const char* path);
    24 void rpFreeLibrary                (RpLibrary* lib);
     24void rpFreeLibrary                (RpLibrary** lib);
    2525
    2626// RpLibrary member functions
    … …  
    5353 */
    5454
    55 RpLibrary* rpGet                 (RpLibrary* lib, const char* path);
     55const char* rpGet                 (RpLibrary* lib, const char* path);
    5656const char* rpGetString           (RpLibrary* lib, const char* path);
    5757double      rpGetDouble           (RpLibrary* lib, const char* path);

  • trunk/include/core/RpLibrary.h

    r115 r125  
    3434        // users member fxns
    3535
    36         RpLibrary* element (std::string path = "", std::string as = "object");
     36        RpLibrary* element (std::string path = "");
    3737
    3838        // should return RpObject& but for simplicity right now it doesnt
    3939        // RpObject will either be an Array, RpString, RpNumber ...
    4040
    41         RpLibrary*  children ( std::string path = "",
     41        RpLibrary*  children  ( std::string path = "",
    4242                                RpLibrary* rpChildNode = NULL,
    4343                                std::string type = "",
    4444                                int* childCount = NULL  );
    4545
    46         RpLibrary*  get (std::string path = "");
    47         std::string getString (std::string path = "");
    48         double      getDouble (std::string path = "");
     46        std::string get       ( std::string path = "");
     47        std::string getString ( std::string path = "");
     48        double      getDouble ( std::string path = "");
    4949
    5050        RpLibrary& put (    std::string path,
    … …  
    6767
    6868        void result();
    69         const char* nodeTypeC();
    70         const char* nodeIdC();
    71         const char* nodeCompC();
    7269
    7370        // no arg constructor
    … …  
    139136
    140137        // copy constructor
    141         // for some reason making this a const gives me problems when calling xml()
     138        // for some reason making this a const gives me problems
     139        // when calling xml()
    142140        // need help looking into this
    143141        // RpLibrary ( const RpLibrary& other )
    … …  
    199197        }// end copy constructor
    200198
    201         // for some reason making this a const gives me problems when calling xml()
     199        // copy assignment operator
     200        // for some reason making this a const gives me problems
     201        // when calling xml()
    202202        // need help looking into this
    203203        // RpLibrary& operator= (const RpLibrary& other) {
    … …  
    224224
    225225                // Loads the XML from other
    226                 // the length cannot be 0 because xml() should not be returning
    227                 // empty strings
     226                // the length cannot be 0 because xml()
     227                // should not be returning empty strings
    228228                buffer = other.xml();
    229229                buffLen = buffer.length();

  • trunk/include/fortran/RpLibraryFInterface.h

    r119 r125  
    5353
    5454void rp_lib_get (           int* handle,
     55                            char* path,
     56                            char* retText,
     57                            int path_len,
     58                            int retText_len );
     59
     60void rp_lib_get_str (       int* handle,
    5561                            char* path,
    5662                            char* retText,

  • trunk/include/fortran/RpLibraryFStubs.h

    r119 r125  
    6464                            int retText_len );
    6565
     66void rp_lib_get_str_ (      int* handle,
     67                            char* path,
     68                            char* retText,
     69                            int path_len,
     70                            int retText_len );
     71
    6672double rp_lib_get_double_ ( int* handle,
    6773                            char* path,
    … …  
    173179                            int retText_len );
    174180
     181void rp_lib_get_str__ (     int* handle,
     182                            char* path,
     183                            char* retText,
     184                            int path_len,
     185                            int retText_len );
     186
    175187double rp_lib_get_double__ (int* handle,
    176188                            char* path,
    … …  
    283295                            int retText_len );
    284296
     297void RP_LIB_GET_STR (       int* handle,
     298                            char* path,
     299                            char* retText,
     300                            int path_len,
     301                            int retText_len );
     302
    285303double RP_LIB_GET_DOUBLE (  int* handle,
    286304                            char* path,
Note: See TracChangeset for help on using the changeset viewer.