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

CGrammar: Add istrue to static assertion expression; add ability to customize istrue truthiness result, add isfalse

Browse Source
This commit is contained in:
Pragmatic Software 2014-09-19 04:17:37 +00:00
parent 9d3c8c0285
commit 79796f9710
4 changed files with 15 additions and 6 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 => 788, BUILD_REVISION => 789,
BUILD_DATE => "2014-09-18", BUILD_DATE => "2014-09-18",
}; };

5
modules/c2english.pl
View File

@ -19,7 +19,7 @@ if($code =~ s/^-f\s+//) {
} }
my ($has_function, $has_main, $got_nomain); my ($has_function, $has_main, $got_nomain);
my $prelude_base = "#define _XOPEN_SOURCE 9001\n#define __USE_XOPEN\n#include <stdio.h>\n#include <stdlib.h>\n#include <string.h>\n#include <unistd.h>\n#include <math.h>\n#include <limits.h>\n#include <sys/types.h>\n#include <stdint.h>\n#include <errno.h>\n#include <ctype.h>\n#include <assert.h>\n#include <stdnoreturn.h>\n#include <stdbool.h>\n#include <stdalign.h>\n#include <time.h>\n#define _Atomic\n#define _Static_assert(a, b)\n\n"; my $prelude_base = "#define _XOPEN_SOURCE 9001\n#define __USE_XOPEN\n#include <stdio.h>\n#include <stdlib.h>\n#include <string.h>\n#include <unistd.h>\n#include <math.h>\n#include <limits.h>\n#include <sys/types.h>\n#include <stdint.h>\n#include <errno.h>\n#include <ctype.h>\n#include <assert.h>\n#include <stdnoreturn.h>\n#include <stdbool.h>\n#include <stdalign.h>\n#include <time.h>\n#include <stddef.h>\n#define _Atomic\n#define _Static_assert(a, b)\n\n";
my $prelude = $prelude_base; my $prelude = $prelude_base;
print "code before: [$code]\n" if $debug; print "code before: [$code]\n" if $debug;
@ -309,6 +309,9 @@ my ($ret, $result) = execute(10, "gcc -std=c11 -pedantic -Werror -Wno-unused -fs
if(not $force and $ret != 0) { if(not $force and $ret != 0) {
$output = $result; $output = $result;
#print STDERR "output: [$output]\n";
$output =~ s/\s*In file included from\s+.*?:\d+:\d+:\s*//g;
$output =~ s/code\.c:\d+:\d+://g; $output =~ s/code\.c:\d+:\d+://g;
$output =~ s/code\.c://g; $output =~ s/code\.c://g;
$output =~ s/error=edantic/error=pedantic/g; $output =~ s/error=edantic/error=pedantic/g;

5
modules/c2english/CGrammar.pm
View File

@ -695,9 +695,10 @@ Static_assert:
| 'static_assert' | 'static_assert'
static_assert_declaration: static_assert_declaration:
Static_assert '(' constant_expression[context => 'static_assert'] ',' string ')' ';' Static_assert '(' constant_expression[context => 'static assert'] ',' string ')' ';'
{ {
$return = "Halt compilation and produce the diagnostic $item{string} unless $item{constant_expression}.\n"; my $expression = ::istrue $item{constant_expression};
$return = "Halt compilation and produce the diagnostic $item{string} unless $expression.\n";
} }
declaration_list: declaration_list:

9
modules/c2english/c2eng.pl
View File

@ -101,19 +101,24 @@ sub flatten {
map { ref eq 'ARRAY' ? flatten(@$_) : $_ } @_ map { ref eq 'ARRAY' ? flatten(@$_) : $_ } @_
} }
sub isfalse {
return istrue($_[0], 'zero');
}
sub istrue { sub istrue {
my @parts = split /(?<!,) and /, $_[0]; my @parts = split /(?<!,) and /, $_[0];
my $truthy = defined $_[1] ? $_[1] : 'nonzero';
my ($result, $and) = ('', ''); my ($result, $and) = ('', '');
foreach my $part (@parts) { foreach my $part (@parts) {
$result .= $and; $result .= $and;
if($part !~ /(discard the result|result discarded|greater|less|equal|false$)/) { if($part !~ /(discard the result|result discarded|greater|less|equal|false$)/) {
$result .= "$part is nonzero"; $result .= "$part is $truthy";
} else { } else {
$result .= $part; $result .= $part;
} }
$and = ' and '; $and = ' and ';
} }
$result =~ s/is nonzero and the result discarded/is evaluated and the result discarded/g; $result =~ s/is $truthy and the result discarded/is evaluated and the result discarded/g;
$result =~ s/is ((?:(?!evaluated).)+) and the result discarded/is evaluated to be $1 and the result discarded/g; $result =~ s/is ((?:(?!evaluated).)+) and the result discarded/is evaluated to be $1 and the result discarded/g;
return $result; return $result;
} }