msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

the callbacks in C now take the concrete syntax as a parameter

Browse Source
This commit is contained in:
krasimir
2015-05-18 14:41:33 +00:00
parent 8cfd46b9bb
commit 3ebadcbc3b
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/runtime/c/pgf/literals.c
View File

@@ -5,7 +5,7 @@
static PgfExprProb* static PgfExprProb*
pgf_match_string_lit(PgfLiteralCallback* self, pgf_match_string_lit(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString sentence, size_t* poffset, GuString sentence, size_t* poffset,
GuPool *out_pool) GuPool *out_pool)
@@ -50,7 +50,7 @@ pgf_predict_empty_next(GuEnum* self, void* to, GuPool* pool)
} }
static GuEnum* static GuEnum*
pgf_predict_empty(PgfLiteralCallback* self, pgf_predict_empty(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString prefix, GuString prefix,
GuPool *out_pool) GuPool *out_pool)
@@ -66,7 +66,7 @@ static PgfLiteralCallback pgf_string_literal_callback =
static PgfExprProb* static PgfExprProb*
pgf_match_int_lit(PgfLiteralCallback* self, pgf_match_int_lit(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString sentence, size_t* poffset, GuString sentence, size_t* poffset,
GuPool *out_pool) GuPool *out_pool)
@@ -120,7 +120,7 @@ static PgfLiteralCallback pgf_int_literal_callback =
static PgfExprProb* static PgfExprProb*
pgf_match_float_lit(PgfLiteralCallback* self, pgf_match_float_lit(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString sentence, size_t* poffset, GuString sentence, size_t* poffset,
GuPool *out_pool) GuPool *out_pool)
@@ -174,7 +174,7 @@ static PgfLiteralCallback pgf_float_literal_callback =
static PgfExprProb* static PgfExprProb*
pgf_match_name_lit(PgfLiteralCallback* self, pgf_match_name_lit(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString sentence, size_t* poffset, GuString sentence, size_t* poffset,
GuPool *out_pool) GuPool *out_pool)

2
src/runtime/c/pgf/parser.c
View File

@@ -1473,7 +1473,7 @@ pgf_parsing_symbol(PgfParsing* ps, PgfItem* item, PgfSymbol sym)
size_t start = ps->before->end_offset; size_t start = ps->before->end_offset;
size_t offset = start; size_t offset = start;
PgfExprProb *ep = PgfExprProb *ep =
callback->match(callback, callback->match(callback, ps->concr,
slit->r, slit->r,
ps->sentence, &offset, ps->sentence, &offset,
ps->out_pool); ps->out_pool);

4
src/runtime/c/pgf/pgf.h
View File

@@ -150,11 +150,11 @@ pgf_complete(PgfConcr* concr, PgfCId cat, GuString string,
typedef struct PgfLiteralCallback PgfLiteralCallback; typedef struct PgfLiteralCallback PgfLiteralCallback;
struct PgfLiteralCallback { struct PgfLiteralCallback {
PgfExprProb* (*match)(PgfLiteralCallback* self, PgfExprProb* (*match)(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString sentence, size_t* poffset, GuString sentence, size_t* poffset,
GuPool *out_pool); GuPool *out_pool);
GuEnum* (*predict)(PgfLiteralCallback* self, GuEnum* (*predict)(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString prefix, GuString prefix,
GuPool *out_pool); GuPool *out_pool);

2
src/runtime/haskell-bind/utils.c
View File

@@ -12,7 +12,7 @@ typedef struct {
} HSPgfLiteralCallback; } HSPgfLiteralCallback;
static PgfExprProb* static PgfExprProb*
hspgf_match_callback(PgfLiteralCallback* self, hspgf_match_callback(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString sentence, size_t* poffset, GuString sentence, size_t* poffset,
GuPool *out_pool) GuPool *out_pool)

4
src/runtime/java/jpgf.c
View File

@@ -389,7 +389,7 @@ typedef struct {
} JPgfTokenProbEnum; } JPgfTokenProbEnum;
static PgfExprProb* static PgfExprProb*
jpgf_literal_callback_match(PgfLiteralCallback* self, jpgf_literal_callback_match(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString sentence, size_t* poffset, GuString sentence, size_t* poffset,
GuPool *out_pool) GuPool *out_pool)
@@ -467,7 +467,7 @@ jpgf_token_prob_enum_fin(GuFinalizer* self)
} }
static GuEnum* static GuEnum*
jpgf_literal_callback_predict(PgfLiteralCallback* self, jpgf_literal_callback_predict(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString prefix, GuString prefix,
GuPool *out_pool) GuPool *out_pool)

4
src/runtime/python/pypgf.c
View File

@@ -1202,7 +1202,7 @@ typedef struct {
} PyPgfLiteralCallback; } PyPgfLiteralCallback;
static PgfExprProb* static PgfExprProb*
pypgf_literal_callback_match(PgfLiteralCallback* self, pypgf_literal_callback_match(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString sentence, size_t* poffset, GuString sentence, size_t* poffset,
GuPool *out_pool) GuPool *out_pool)
@@ -1264,7 +1264,7 @@ pypgf_literal_callback_match(PgfLiteralCallback* self,
} }
static GuEnum* static GuEnum*
pypgf_literal_callback_predict(PgfLiteralCallback* self, pypgf_literal_callback_predict(PgfLiteralCallback* self, PgfConcr* concr,
size_t lin_idx, size_t lin_idx,
GuString prefix, GuString prefix,
GuPool *out_pool) GuPool *out_pool)