duckduckgo
/
zeroclickinfo-goodies
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add binary operators OR,AND,XOR,NOT

master
msingletary 2016-05-21 09:40:45 +00:00
parent 8e74d245c7
commit 6eb63bfed8
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/DDG/Goodie/BinaryLogic.pm
View File

@ -10,8 +10,10 @@ use Marpa::R2;
# Regexp triggers are used to find cases where the logical symbol # Regexp triggers are used to find cases where the logical symbol
# for 'not' is at the beginning of the query (e.g. the case '¬1') # for 'not' is at the beginning of the query (e.g. the case '¬1')
triggers query_raw => qr/.*\s+(and|or|xor)\s+.*/; triggers query_raw => qr/.*\s+(and|or|xor)\s+.*/;
triggers query_raw => qr/.*\s+(AND|OR|XOR)\s+.*/;
triggers query_raw => qr/.*\s*(⊕|∧|∨)\s*.*/; triggers query_raw => qr/.*\s*(⊕|∧|∨)\s*.*/;
triggers query_raw => qr/not\s+.*/; triggers query_raw => qr/not\s+.*/;
triggers query_raw => qr/NOT\s+.*/;
triggers query_raw => qr/¬.*/; triggers query_raw => qr/¬.*/;
zci is_cached => 1; zci is_cached => 1;
@ -27,9 +29,13 @@ Term ::=
('(') Term (')') assoc => group action => ::first ('(') Term (')') assoc => group action => ::first
| Number | Number
| 'not' Term action => do_not | 'not' Term action => do_not
| 'NOT' Term action => do_not
|| Term 'xor' Term action => do_xor || Term 'xor' Term action => do_xor
|| Term 'XOR' Term action => do_xor
| Term 'and' Term action => do_and | Term 'and' Term action => do_and
| Term 'AND' Term action => do_and
| Term 'or' Term action => do_or | Term 'or' Term action => do_or
| Term 'OR' Term action => do_or
Number ::= Number ::=
HexNumber action => hex_number HexNumber action => hex_number
@ -84,7 +90,7 @@ handle query_raw => sub {
my $input = $_; my $input = $_;
my $testError = $input; my $testError = $input;
$testError =~ s/(?:0x|0b|[\d\s]|and|or|xor|not|\(|\)|⊕|∧|∨|¬)//ig; $testError =~ s/(?:0x|0b|[\d\s]|and|or|xor|not|AND|OR|XOR|NOT|\(|\)|⊕|∧|∨|¬)//ig;
return if length $testError != 0; return if length $testError != 0;
my $grammar = Marpa::R2::Scanless::G->new({ source => \$rules }); my $grammar = Marpa::R2::Scanless::G->new({ source => \$rules });

6
t/BinaryLogic.t
View File

@ -31,28 +31,34 @@ ddg_goodie_test(
DDG::Goodie::BinaryLogic DDG::Goodie::BinaryLogic
)], )],
'4 xor 5' => test_zci(build_answer('1', sprintf "%b XOR %b", 4, 5)), '4 xor 5' => test_zci(build_answer('1', sprintf "%b XOR %b", 4, 5)),
'4 XOR 5' => test_zci(build_answer('1', sprintf "%b XOR %b", 4, 5)),
'4 ⊕ 5' => test_zci(build_answer('1', sprintf "%b XOR %b", 4, 5)), '4 ⊕ 5' => test_zci(build_answer('1', sprintf "%b XOR %b", 4, 5)),
'4⊕5' => test_zci(build_answer('1', sprintf "%b XOR %b", 4, 5)), '4⊕5' => test_zci(build_answer('1', sprintf "%b XOR %b", 4, 5)),
'9489 xor 394 xor 9349 xor 39 xor 29 xor 4967 xor 3985' => '9489 xor 394 xor 9349 xor 39 xor 29 xor 4967 xor 3985' =>
test_zci(build_answer('7378', sprintf "%b XOR %b XOR %b XOR %b XOR %b XOR %b XOR %b", 9489, 394, 9349, 39, 29, 4967, 3985)), test_zci(build_answer('7378', sprintf "%b XOR %b XOR %b XOR %b XOR %b XOR %b XOR %b", 9489, 394, 9349, 39, 29, 4967, 3985)),
'10 and 12' => test_zci(build_answer('8', sprintf "%b AND %b", 10, 12)), '10 and 12' => test_zci(build_answer('8', sprintf "%b AND %b", 10, 12)),
'10 AND 12' => test_zci(build_answer('8', sprintf "%b AND %b", 10, 12)),
'10 ∧ 12' => test_zci(build_answer('8', sprintf "%b AND %b", 10, 12)), '10 ∧ 12' => test_zci(build_answer('8', sprintf "%b AND %b", 10, 12)),
'10∧12' => test_zci(build_answer('8', sprintf "%b AND %b", 10, 12)), '10∧12' => test_zci(build_answer('8', sprintf "%b AND %b", 10, 12)),
'52 or 100' => test_zci(build_answer('116', sprintf "%b OR %b", 52, 100)), '52 or 100' => test_zci(build_answer('116', sprintf "%b OR %b", 52, 100)),
'52 OR 100' => test_zci(build_answer('116', sprintf "%b OR %b", 52, 100)),
'52 ∨ 100' => test_zci(build_answer('116', sprintf "%b OR %b", 52, 100)), '52 ∨ 100' => test_zci(build_answer('116', sprintf "%b OR %b", 52, 100)),
'52∨100' => test_zci(build_answer('116', sprintf "%b OR %b", 52, 100)), '52∨100' => test_zci(build_answer('116', sprintf "%b OR %b", 52, 100)),
'23 and (30 or 128)' => test_zci(build_answer('22', sprintf "%b AND (%b OR %b)", 23, 30, 128)), '23 and (30 or 128)' => test_zci(build_answer('22', sprintf "%b AND (%b OR %b)", 23, 30, 128)),
'23 AND (30 OR 128)' => test_zci(build_answer('22', sprintf "%b AND (%b OR %b)", 23, 30, 128)),
'23 ∧ (30 ∨ 128)' => test_zci(build_answer('22', sprintf "%b AND (%b OR %b)", 23, 30, 128)), '23 ∧ (30 ∨ 128)' => test_zci(build_answer('22', sprintf "%b AND (%b OR %b)", 23, 30, 128)),
'23∧(30∨128)' => test_zci(build_answer('22', sprintf "%b AND (%b OR %b)", 23, 30, 128)), '23∧(30∨128)' => test_zci(build_answer('22', sprintf "%b AND (%b OR %b)", 23, 30, 128)),
'0x999 xor 0x589' => test_zci(build_answer('3088', sprintf "%b XOR %b", hex(999), hex(589))), '0x999 xor 0x589' => test_zci(build_answer('3088', sprintf "%b XOR %b", hex(999), hex(589))),
'0x999 ⊕ 0x589' => test_zci(build_answer('3088', sprintf "%b XOR %b", hex(999), hex(589))), '0x999 ⊕ 0x589' => test_zci(build_answer('3088', sprintf "%b XOR %b", hex(999), hex(589))),
'not 1' => test_zci(build_answer('18446744073709551614', sprintf "NOT %b", 1)), 'not 1' => test_zci(build_answer('18446744073709551614', sprintf "NOT %b", 1)),
'NOT 1' => test_zci(build_answer('18446744073709551614', sprintf "NOT %b", 1)),
'¬1' => test_zci(build_answer('18446744073709551614', sprintf "NOT %b", 1)), '¬1' => test_zci(build_answer('18446744073709551614', sprintf "NOT %b", 1)),
'3 and 2' => test_zci(build_answer('2', sprintf "%b AND %b", 3, 2)), '3 and 2' => test_zci(build_answer('2', sprintf "%b AND %b", 3, 2)),
'1 or 1234' => test_zci(build_answer('1235', sprintf "%b OR %b", 1, 1234)), '1 or 1234' => test_zci(build_answer('1235', sprintf "%b OR %b", 1, 1234)),
'34 or 100' => test_zci(build_answer('102', sprintf "%b OR %b", 34, 100)), '34 or 100' => test_zci(build_answer('102', sprintf "%b OR %b", 34, 100)),
'10 and (30 or 128)' => test_zci(build_answer('10', sprintf "%b AND (%b OR %b)", 10, 30, 128)), '10 and (30 or 128)' => test_zci(build_answer('10', sprintf "%b AND (%b OR %b)", 10, 30, 128)),
'0x01 or not 0X100' => test_zci(build_answer('18446744073709551359', sprintf "%b OR NOT %b", hex(1), hex(100))), '0x01 or not 0X100' => test_zci(build_answer('18446744073709551359', sprintf "%b OR NOT %b", hex(1), hex(100))),
'0x01 OR NOT 0X100' => test_zci(build_answer('18446744073709551359', sprintf "%b OR NOT %b", hex(1), hex(100))),
'0x01 or 0x02' => test_zci(build_answer('3', sprintf "%b OR %b", hex(1), hex(2))), '0x01 or 0x02' => test_zci(build_answer('3', sprintf "%b OR %b", hex(1), hex(2))),
'0b01 or 0b10' => test_zci(build_answer('3', sprintf "01 OR 10")), '0b01 or 0b10' => test_zci(build_answer('3', sprintf "01 OR 10")),
'0B11 xor 0B10' => test_zci(build_answer('1', sprintf "11 XOR 10")), '0B11 xor 0B10' => test_zci(build_answer('1', sprintf "11 XOR 10")),