added mkStr to the Haskell binding

This commit is contained in:
kr.angelov
2014-12-19 08:58:02 +00:00
parent fdc6c9a3cd
commit 022849482d
4 changed files with 33 additions and 12 deletions

View File

@@ -96,6 +96,22 @@ pgf_expr_apply(PgfApplication* app, GuPool* pool)
return expr;
}
PgfExpr
pgf_expr_string(GuString str, GuPool* pool)
{
PgfLiteral lit;
PgfLiteralStr* plit =
gu_new_flex_variant(PGF_LITERAL_STR,
PgfLiteralStr,
val, strlen(str)+1,
&lit, pool);
strcpy(plit->val, str);
return gu_new_variant_i(pool,
PGF_EXPR_LIT,
PgfExprLit,
lit);
}
typedef struct PgfExprParser PgfExprParser;
typedef enum {
@@ -411,17 +427,7 @@ pgf_expr_parser_term(PgfExprParser* parser)
char* str =
gu_buf_data(parser->token_value);
pgf_expr_parser_token(parser);
PgfLiteral lit;
PgfLiteralStr* plit =
gu_new_flex_variant(PGF_LITERAL_STR,
PgfLiteralStr,
val, strlen(str)+1,
&lit, parser->expr_pool);
strcpy(plit->val, str);
return gu_new_variant_i(parser->expr_pool,
PGF_EXPR_LIT,
PgfExprLit,
lit);
return pgf_expr_string(str, parser->expr_pool);
}
case PGF_TOKEN_FLT: {
char* str =

View File

@@ -146,6 +146,9 @@ pgf_expr_unapply(PgfExpr expr, GuPool* pool);
PgfExpr
pgf_expr_apply(PgfApplication*, GuPool* pool);
PgfExpr
pgf_expr_string(GuString, GuPool* pool);
PgfExpr
pgf_read_expr(GuIn* in, GuPool* pool, GuExn* err);