rasqal.h   rasqal.h 
skipping to change at line 38 skipping to change at line 38
extern "C" { extern "C" {
#endif #endif
/** /**
* RASQAL_VERSION: * RASQAL_VERSION:
* *
* Rasqal library version number * Rasqal library version number
* *
* Format: major * 10000 + minor * 100 + release * Format: major * 10000 + minor * 100 + release
*/ */
#define RASQAL_VERSION 927 #define RASQAL_VERSION 928
/** /**
* RASQAL_VERSION_STRING: * RASQAL_VERSION_STRING:
* *
* Rasqal library version string * Rasqal library version string
*/ */
#define RASQAL_VERSION_STRING "0.9.27" #define RASQAL_VERSION_STRING "0.9.28"
/** /**
* RASQAL_VERSION_MAJOR: * RASQAL_VERSION_MAJOR:
* *
* Rasqal library major version * Rasqal library major version
*/ */
#define RASQAL_VERSION_MAJOR 0 #define RASQAL_VERSION_MAJOR 0
/** /**
* RASQAL_VERSION_MINOR: * RASQAL_VERSION_MINOR:
* *
* Rasqal library minor version * Rasqal library minor version
*/ */
#define RASQAL_VERSION_MINOR 9 #define RASQAL_VERSION_MINOR 9
/** /**
* RASQAL_VERSION_RELEASE: * RASQAL_VERSION_RELEASE:
* *
* Rasqal library release * Rasqal library release
*/ */
#define RASQAL_VERSION_RELEASE 27 #define RASQAL_VERSION_RELEASE 28
/** /**
* RASQAL_API: * RASQAL_API:
* *
* Macro for wrapping API function call declarations. * Macro for wrapping API function call declarations.
* *
*/ */
#ifndef RASQAL_API #ifndef RASQAL_API
# ifdef WIN32 # ifdef WIN32
# ifdef __GNUC__ # ifdef __GNUC__
skipping to change at line 117 skipping to change at line 117
#endif #endif
#if 1 #if 1
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#if 1 #if 1
#include <time.h> #include <time.h>
#endif #endif
/* Public statics */ /* Public statics */
/**
* rasqal_short_copyright_string:
*
* Short copyright string (one line).
*/
RASQAL_API RASQAL_API
extern const char * const rasqal_short_copyright_string; extern const char * const rasqal_short_copyright_string;
/**
* rasqal_copyright_string:
*
* Copyright string (multiple lines).
*/
RASQAL_API RASQAL_API
extern const char * const rasqal_copyright_string; extern const char * const rasqal_copyright_string;
/**
* rasqal_version_string:
*
* Raptor version as a string.
*/
RASQAL_API RASQAL_API
extern const char * const rasqal_version_string; extern const char * const rasqal_version_string;
/**
* rasqal_version_major:
*
* Raptor major version number.
*/
RASQAL_API RASQAL_API
extern const unsigned int rasqal_version_major; extern const unsigned int rasqal_version_major;
/**
* rasqal_version_minor:
*
* Raptor minor version number.
*/
RASQAL_API RASQAL_API
extern const unsigned int rasqal_version_minor; extern const unsigned int rasqal_version_minor;
/**
* rasqal_version_release:
*
* Raptor release version number.
*/
RASQAL_API RASQAL_API
extern const unsigned int rasqal_version_release; extern const unsigned int rasqal_version_release;
/**
* rasqal_version_decimal:
*
* Raptor version as a decimal number.
*
* Format: major * 10000 + minor * 100 + release
*/
RASQAL_API RASQAL_API
extern const unsigned int rasqal_version_decimal; extern const unsigned int rasqal_version_decimal;
/**
* rasqal_license_string:
*
* Raptor license string.
*/
RASQAL_API RASQAL_API
extern const char * const rasqal_license_string; extern const char * const rasqal_license_string;
/**
* rasqal_home_url_string:
*
* Raptor home page URL.
*/
RASQAL_API RASQAL_API
extern const char * const rasqal_home_url_string; extern const char * const rasqal_home_url_string;
/** /**
* RASQAL_RAPTOR_VERSION: * RASQAL_RAPTOR_VERSION:
* *
* Version of Raptor that Rasqal was configured against. * Version of Raptor that Rasqal was configured against.
*/ */
#define RASQAL_RAPTOR_VERSION 20004 #define RASQAL_RAPTOR_VERSION 20008
/* Public structures */ /* Public structures */
#ifndef RASQAL_WORLD_DECLARED #ifndef RASQAL_WORLD_DECLARED
#define RASQAL_WORLD_DECLARED 1 #define RASQAL_WORLD_DECLARED 1
/** /**
* rasqal_world: * rasqal_world:
* *
* Rasqal world class. * Rasqal world class.
*/ */
skipping to change at line 598 skipping to change at line 654
* @RASQAL_EXPR_ABS: Expression for SPARQL 1.1 ABS() * @RASQAL_EXPR_ABS: Expression for SPARQL 1.1 ABS()
* @RASQAL_EXPR_ROUND: Expression for SPARQL 1.1 ROUND() * @RASQAL_EXPR_ROUND: Expression for SPARQL 1.1 ROUND()
* @RASQAL_EXPR_CEIL: Expression for SPARQL 1.1 CEIL() * @RASQAL_EXPR_CEIL: Expression for SPARQL 1.1 CEIL()
* @RASQAL_EXPR_FLOOR: Expression for SPARQL 1.1 FLOOR() * @RASQAL_EXPR_FLOOR: Expression for SPARQL 1.1 FLOOR()
* @RASQAL_EXPR_MD5: Expression for SPARQL 1.1 MD5() * @RASQAL_EXPR_MD5: Expression for SPARQL 1.1 MD5()
* @RASQAL_EXPR_SHA1: Expression for SPARQL 1.1 SHA1() * @RASQAL_EXPR_SHA1: Expression for SPARQL 1.1 SHA1()
* @RASQAL_EXPR_SHA224: Expression for SPARQL 1.1 SHA224() * @RASQAL_EXPR_SHA224: Expression for SPARQL 1.1 SHA224()
* @RASQAL_EXPR_SHA256: Expression for SPARQL 1.1 SHA256() * @RASQAL_EXPR_SHA256: Expression for SPARQL 1.1 SHA256()
* @RASQAL_EXPR_SHA384: Expression for SPARQL 1.1 SHA384() * @RASQAL_EXPR_SHA384: Expression for SPARQL 1.1 SHA384()
* @RASQAL_EXPR_SHA512: Expression for SPARQL 1.1 SHA512() * @RASQAL_EXPR_SHA512: Expression for SPARQL 1.1 SHA512()
* @RASQAL_EXPR_STRBEFORE: Expression for SPARQL 1.1 STRBEFORE()
* @RASQAL_EXPR_STRAFTER: Expression for SPARQL 1.1 STRAFTER()
* @RASQAL_EXPR_REPLACE: Expression for SPARQL 1.1 REPLACE()
* @RASQAL_EXPR_UNKNOWN: Internal * @RASQAL_EXPR_UNKNOWN: Internal
* @RASQAL_EXPR_LAST: Internal * @RASQAL_EXPR_LAST: Internal
* *
* Rasqal expression operators. A mixture of unary, binary and * Rasqal expression operators. A mixture of unary, binary and
* tertiary operators (string matches). Also includes casting and * tertiary operators (string matches). Also includes casting and
* two ordering operators from ORDER BY in SPARQL. * two ordering operators from ORDER BY in SPARQL.
*/ */
typedef enum { typedef enum {
/* internal */ /* internal */
RASQAL_EXPR_UNKNOWN, RASQAL_EXPR_UNKNOWN,
skipping to change at line 695 skipping to change at line 754
RASQAL_EXPR_ABS, RASQAL_EXPR_ABS,
RASQAL_EXPR_ROUND, RASQAL_EXPR_ROUND,
RASQAL_EXPR_CEIL, RASQAL_EXPR_CEIL,
RASQAL_EXPR_FLOOR, RASQAL_EXPR_FLOOR,
RASQAL_EXPR_MD5, RASQAL_EXPR_MD5,
RASQAL_EXPR_SHA1, RASQAL_EXPR_SHA1,
RASQAL_EXPR_SHA224, RASQAL_EXPR_SHA224,
RASQAL_EXPR_SHA256, RASQAL_EXPR_SHA256,
RASQAL_EXPR_SHA384, RASQAL_EXPR_SHA384,
RASQAL_EXPR_SHA512, RASQAL_EXPR_SHA512,
RASQAL_EXPR_STRBEFORE,
RASQAL_EXPR_STRAFTER,
RASQAL_EXPR_REPLACE,
/* internal */ /* internal */
RASQAL_EXPR_LAST = RASQAL_EXPR_SHA512 RASQAL_EXPR_LAST = RASQAL_EXPR_REPLACE
} rasqal_op; } rasqal_op;
/** /**
* rasqal_expression_flags: * rasqal_expression_flags:
* @RASQAL_EXPR_FLAG_DISTINCT: Distinct * @RASQAL_EXPR_FLAG_DISTINCT: Distinct
* @RASQAL_EXPR_FLAG_AGGREGATE: Aggregate function expression * @RASQAL_EXPR_FLAG_AGGREGATE: Aggregate function expression
* *
* Flags for expressions. * Flags for expressions.
*/ */
typedef enum { typedef enum {
skipping to change at line 747 skipping to change at line 809
struct rasqal_expression_s* arg2; struct rasqal_expression_s* arg2;
struct rasqal_expression_s* arg3; struct rasqal_expression_s* arg3;
rasqal_literal* literal; rasqal_literal* literal;
unsigned char *value; unsigned char *value;
raptor_uri* name; raptor_uri* name;
raptor_sequence* args; raptor_sequence* args;
raptor_sequence* params; raptor_sequence* params;
unsigned int flags; unsigned int flags;
struct rasqal_expression_s* arg4;
}; };
typedef struct rasqal_expression_s rasqal_expression; typedef struct rasqal_expression_s rasqal_expression;
/** /**
* rasqal_triple: * rasqal_triple:
* @subject: Triple subject. * @subject: Triple subject.
* @predicate: Triple predicate. * @predicate: Triple predicate.
* @object: Triple object. * @object: Triple object.
* @origin: Triple origin. * @origin: Triple origin.
* @flags: Or of enum #rasqal_triple_flags bits. * @flags: Or of enum #rasqal_triple_flags bits.
skipping to change at line 1356 skipping to change at line 1419
*/ */
typedef enum { typedef enum {
RASQAL_COMPARE_NOCASE = 1, RASQAL_COMPARE_NOCASE = 1,
RASQAL_COMPARE_XQUERY = 2, RASQAL_COMPARE_XQUERY = 2,
RASQAL_COMPARE_RDF = 4, RASQAL_COMPARE_RDF = 4,
RASQAL_COMPARE_URI = 8, RASQAL_COMPARE_URI = 8,
RASQAL_COMPARE_SAMETERM = 16 RASQAL_COMPARE_SAMETERM = 16
} rasqal_compare_flags; } rasqal_compare_flags;
/** /**
* rasqal_random:
*
* Internal
*/
typedef struct rasqal_random_s rasqal_random;
/**
* rasqal_evaluation_context: * rasqal_evaluation_context:
* @world: rasqal world * @world: rasqal world
* @base_uri: base URI of expression context (or NULL) * @base_uri: base URI of expression context (or NULL)
* @locator: locator or NULL * @locator: locator or NULL
* @seed: used for rand_r() (if available) or srand()
* @flags: expression comparison flags * @flags: expression comparison flags
* @seed: random seeed
* @random: random number generator object
* *
* A context for evaluating an expression such as with * A context for evaluating an expression such as with
* rasqal_expression_evaluate2() * rasqal_expression_evaluate2()
*/ */
typedef struct { typedef struct {
rasqal_world *world; rasqal_world *world;
raptor_uri* base_uri; raptor_uri* base_uri;
raptor_locator *locator; raptor_locator *locator;
int flags; int flags;
unsigned int seed; unsigned int seed;
rasqal_random* random;
} rasqal_evaluation_context; } rasqal_evaluation_context;
/* Expression class */ /* Expression class */
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_0op_expression(rasqal_world* world, rasqal_op op); rasqal_expression* rasqal_new_0op_expression(rasqal_world* world, rasqal_op op);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_1op_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg); rasqal_expression* rasqal_new_1op_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_2op_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, rasqal_expression* arg2); rasqal_expression* rasqal_new_2op_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, rasqal_expression* arg2);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_3op_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, rasqal_expression* arg2, rasqal_expression* arg3); rasqal_expression* rasqal_new_3op_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, rasqal_expression* arg2, rasqal_expression* arg3);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_4op_expression(rasqal_world* world, rasqal_op
op, rasqal_expression* arg1, rasqal_expression* arg2, rasqal_expression* a
rg3, rasqal_expression* arg4);
RASQAL_API
rasqal_expression* rasqal_new_string_op_expression(rasqal_world* world, ras qal_op op, rasqal_expression* arg1, rasqal_literal* literal); rasqal_expression* rasqal_new_string_op_expression(rasqal_world* world, ras qal_op op, rasqal_expression* arg1, rasqal_literal* literal);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_literal_expression(rasqal_world* world, rasqa l_literal* literal); rasqal_expression* rasqal_new_literal_expression(rasqal_world* world, rasqa l_literal* literal);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_function_expression(rasqal_world* world, rapt or_uri* name, raptor_sequence* args, raptor_sequence* params, unsigned int flags); rasqal_expression* rasqal_new_function_expression(rasqal_world* world, rapt or_uri* name, raptor_sequence* args, raptor_sequence* params, unsigned int flags);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_aggregate_function_expression(rasqal_world* w orld, rasqal_op op, rasqal_expression* arg1, raptor_sequence* params, unsig ned int flags); rasqal_expression* rasqal_new_aggregate_function_expression(rasqal_world* w orld, rasqal_op op, rasqal_expression* arg1, raptor_sequence* params, unsig ned int flags);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_cast_expression(rasqal_world* world, raptor_u ri* name, rasqal_expression *value); rasqal_expression* rasqal_new_cast_expression(rasqal_world* world, raptor_u ri* name, rasqal_expression *value);
RASQAL_API RASQAL_API
skipping to change at line 1984 skipping to change at line 2058
* *
* Internal - see #rasqal_triples_source * Internal - see #rasqal_triples_source
*/ */
/** /**
* support_feature: * support_feature:
* @user_data: user data * @user_data: user data
* @feature: feature to test * @feature: feature to test
* *
* Internal - see #rasqal_triples_source * Internal - see #rasqal_triples_source
*
* Return value: non-0 if supported
*/ */
/** /**
* rasqal_variables_table: * rasqal_variables_table:
* *
* Internal - for now * Internal - for now
*/ */
#ifdef __cplusplus #ifdef __cplusplus
} }
 End of changes. 23 change blocks. 
6 lines changed or deleted 84 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/