emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

redefine in() and not_in() in terms of action with 'chr'

Browse source
This commit is contained in:
Meredith L. Patterson 2013-12-11 06:49:52 +01:00
parent de02a2450b
commit 8c074420f7
3 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bindings/php/Tests/InTest.php
View file

@ -7,7 +7,7 @@ class InTest extends PHPUnit_Framework_TestCase
protected function setUp()
{
$this->parser = h_in("abc");
$this->parser = in("abc");
}
public function testSuccess()
{

2
src/bindings/php/Tests/NotInTest.php
View file

@ -7,7 +7,7 @@ class NotInTest extends PHPUnit_Framework_TestCase
protected function setUp()
{
$this->parser = h_not_in("abc");
$this->parser = not_in("abc");
}
public function testSuccess()
{

34
src/bindings/swig/hammer.i
View file

@ -204,11 +204,19 @@
RETVAL_STRINGL((char*)$1->token, $1->len, 1);
}
/* TODO do we need this anymore?
%typemap(out) struct HCountedArray_* {
%typemap(in) HAction* {
if (IS_CALLABLE == Z_TYPE_PP($input)) {
if (!zend_make_callable($1, *$input TSRMLS_CC)) {
// FIXME some error
$1 = NULL;
}
// don't need an else here, $1 gets populated
} else {
// FIXME some error
$1 = NULL;
}
}
*/
%typemap(out) struct HParseResult_* {
if ($1 == NULL) {
// TODO: raise parse failure
@ -255,10 +263,6 @@
}
*/
%typemap(in) (const HAction a, void* user_data) {
$2 = $input;
$1 = call_action;
}
#else
#warning no Hammer typemaps defined
#endif
@ -565,5 +569,19 @@ function sequence()
return h_sequence__a($arg_list);
}
function action($p, $act)
{
return h_action($p, $act);
}
function in($charset)
{
return action(h_in($charset), 'chr');
}
function not_in($charset)
{
return action(h_not_in($charset), 'chr');
}
"
#endif