GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-01-23 02:24:25 +01:00
Code Issues Projects Releases Wiki Activity

CGrammar: Improve conditional operator translation

Browse Source
This commit is contained in:
Pragmatic Software 2014-06-18 01:08:19 +00:00
parent 8f5e4c9e88
commit 7590644422
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PBot/VERSION.pm
View File

@ -13,7 +13,7 @@ use warnings;
# These are set automatically by the build/commit script # These are set automatically by the build/commit script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 653, BUILD_REVISION => 654,
BUILD_DATE => "2014-06-17", BUILD_DATE => "2014-06-17",
}; };

7
modules/c2english/CGrammar.pm
View File

@ -421,7 +421,10 @@ conditional_expression:
logical_OR_AND_expression[context => $arg{context}] conditional_ternary_expression logical_OR_AND_expression[context => $arg{context}] conditional_ternary_expression
{ {
if($item{conditional_ternary_expression}) { if($item{conditional_ternary_expression}) {
$return = "depending on if $item{logical_OR_AND_expression} is true then $item{conditional_ternary_expression}"; my $op1 = $item{conditional_ternary_expression}->[0];
my $op2 = $item{conditional_ternary_expression}->[1];
my $istrue = $item{logical_OR_AND_expression} =~ /(greater|less|equal)/ ? '' : ' is true';
$return = "$op1 if $item{logical_OR_AND_expression}$istrue otherwise to $op2";
} else { } else {
$return = $item{logical_OR_AND_expression}; $return = $item{logical_OR_AND_expression};
} }
@ -429,7 +432,7 @@ conditional_expression:
conditional_ternary_expression: conditional_ternary_expression:
'?' expression ':' conditional_expression '?' expression ':' conditional_expression
{ $return = "$item{expression} otherwise $item{conditional_expression}"; } { $return = [$item{expression}, $item{conditional_expression}]; }
| {""} | {""}
assignment_operator: assignment_operator: