3
0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-23 19:22:40 +01:00

More progress on CGrammar.pm

This commit is contained in:
Pragmatic Software 2014-06-08 13:51:29 +00:00
parent ca91e34a25
commit 6641bc3cf2
3 changed files with 37 additions and 29 deletions

View File

@ -13,8 +13,8 @@ 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 => 619, BUILD_REVISION => 620,
BUILD_DATE => "2014-06-07", BUILD_DATE => "2014-06-08",
}; };
1; 1;

View File

@ -81,7 +81,8 @@ open my $fh, '>', 'code.c' or die "Could not write code: $!";
print $fh $code; print $fh $code;
close $fh; close $fh;
my ($ret, $result) = execute(10, "gcc -std=c89 -pedantic -Werror -Wno-unused -fsyntax-only -fno-diagnostics-show-option -fno-diagnostics-show-caret code.c"); #my ($ret, $result) = execute(10, "gcc -std=c89 -pedantic -Werror -Wno-unused -fsyntax-only -fno-diagnostics-show-option -fno-diagnostics-show-caret code.c");
my ($ret, $result) = execute(10, "gcc -std=gnu89 -Werror -Wno-unused -fsyntax-only -fno-diagnostics-show-option -fno-diagnostics-show-caret code.c");
if(not $force and $ret != 0) { if(not $force and $ret != 0) {
$output = $result; $output = $result;
@ -162,9 +163,9 @@ close $fh;
$output = `./c2eng.pl code2eng.c` if not defined $output; $output = `./c2eng.pl code2eng.c` if not defined $output;
if(not $has_function and not $has_main) { if(not $has_function and not $has_main) {
$output =~ s/Let 'main' be a function taking no parameters and returning int.\s*To perform the function:\s*//; $output =~ s/Let .main. be a function taking no parameters and returning int.\s*To perform the function:\s*//;
$output =~ s/\s*Return 0.\s*$//; $output =~ s/\s*Return 0.\s*$//;
$output =~ s/\s*Return 0.\s*End of function 'main'.\s*//; $output =~ s/\s*Return 0.\s*End of function .main..\s*//;
$output =~ s/\s*Do nothing.\s*$//; $output =~ s/\s*Do nothing.\s*$//;
$output =~ s/^\s*(.)/\U$1/; $output =~ s/^\s*(.)/\U$1/;
} }

View File

@ -13,8 +13,8 @@
# etc # etc
{ {
my @defined_types = ('FILE'); my @defined_types = ('`FILE`');
my ($basic, $add_on, @basics, $rule_context, $rule_name, @macros, $array_size); my ($basic, @basics, $rule_name, @macros);
} }
startrule: startrule:
@ -43,8 +43,6 @@ preproc:
| pragma | pragma
| preproc_conditional[matchrule => $arg{matchrule}] | preproc_conditional[matchrule => $arg{matchrule}]
{ $return = $item[-1]; } { $return = $item[-1]; }
| '#' /^.*\n/
{ print STDERR "Unknown CPP directive $item[-1]\n"; $return = ""; }
definition: definition:
<skip: '[ \t]*'> /\n*/ macro_definition <skip: '[ \t]*'> /\n*/ macro_definition
@ -183,8 +181,8 @@ function_definition:
my $return_type = $item{declarator}; my $return_type = $item{declarator};
my $name = $item{declarator}; my $name = $item{declarator};
$name =~ s/^.*?'/'/; $name =~ s/^.*?`/`/;
$return_type =~ s/\'.*\'//; $return_type =~ s/`.*`//;
if ($return_type =~ /\w/ ) { if ($return_type =~ /\w/ ) {
$return_type .= "to a "; $return_type .= "to a ";
@ -602,7 +600,7 @@ declaration:
declaration_specifiers init_declarator_list(?) ';' declaration_specifiers init_declarator_list(?) ';'
{ {
# This whole thing needs to be re-written to parse declarations inside-out. # This whole thing needs to be re-written to parse declarations inside-out.
my @init_list = @{$item{'init_declarator_list(?)'}->[0]}; my @init_list = defined $item{'init_declarator_list(?)'}->[0] ? @{$item{'init_declarator_list(?)'}->[0]} : ('');
my $init_declaration_list; my $init_declaration_list;
if ($item{declaration_specifiers} =~ s/type definition of //) { if ($item{declaration_specifiers} =~ s/type definition of //) {
@ -616,8 +614,7 @@ declaration:
$return = "Let $init_declaration_list be another name for $item{declaration_specifiers}.\n"; $return = "Let $init_declaration_list be another name for $item{declaration_specifiers}.\n";
# add to defined types, removing single-quotes push @defined_types, @init_list;
push @defined_types, map { s/'//g; $_ } @init_list;
} else { } else {
my $and = @init_list > 1 ? ' and' : ''; my $and = @init_list > 1 ? ' and' : '';
@ -632,7 +629,11 @@ declaration:
$match_prefix = undef; $match_prefix = undef;
} }
if(length $name) {
$return .= $name; $return .= $name;
} else {
$return .= 'there';
}
for(my $i = 0; $i < @init_list; $i++) { for(my $i = 0; $i < @init_list; $i++) {
my ($prefix, $name) = split / ([^ ]+)$/, $init_list[$i]; my ($prefix, $name) = split / ([^ ]+)$/, $init_list[$i];
@ -681,9 +682,9 @@ init_declarator:
} else { } else {
$return = "initialized to $init as "; $return = "initialized to $init as ";
} }
}
$return .= $item{declarator}; $return .= $item{declarator};
} }
}
initializer: initializer:
comment(?) assignment_expression comment(?) comment(?) assignment_expression comment(?)
@ -751,7 +752,6 @@ postfix_expression:
push @basics, $basic; push @basics, $basic;
$basic = $item{primary_expression}; $basic = $item{primary_expression};
$add_on = 0 ;
$return = $item{primary_expression}; $return = $item{primary_expression};
1; 1;
} }
@ -940,7 +940,7 @@ primary_expression:
| string | string
| identifier | identifier
{ {
$return = "`$item{identifier}`"; $return = "$item{identifier}";
} }
declarator: declarator:
@ -952,9 +952,9 @@ direct_declarator:
identifier[context => 'direct_declarator'] array_declarator(s?) identifier[context => 'direct_declarator'] array_declarator(s?)
{ {
if(@{$item{'array_declarator(s?)'}}) { if(@{$item{'array_declarator(s?)'}}) {
$return = join('', @{$item{'array_declarator(s?)'}}) . "'$item{identifier}'"; $return = join('', @{$item{'array_declarator(s?)'}}) . "$item{identifier}";
} else { } else {
$return = "'$item{identifier}'"; $return = "$item{identifier}";
} }
} }
| '(' declarator ')' array_declarator(s) | '(' declarator ')' array_declarator(s)
@ -978,9 +978,9 @@ array_declarator:
( '[' assignment_expression(?) ']' ( '[' assignment_expression(?) ']'
{ {
if (@{$item{'assignment_expression(?)'}}) { if (@{$item{'assignment_expression(?)'}}) {
$array_size = 'size '. join('',@{$item{'assignment_expression(?)'}}) . ' '; $return = 'size '. join('',@{$item{'assignment_expression(?)'}}) . ' ';
} else { } else {
$array_size = 'unspecified size '; $return = 'unspecified size ';
} }
} }
)(s?) )(s?)
@ -1162,12 +1162,13 @@ struct_or_union_specifier:
{ {
my $identifier = join('',@{$item{'identifier(?)'}}); my $identifier = join('',@{$item{'identifier(?)'}});
$return = join('',@{$item{'comment(?)'}}) . $item{struct_or_union}; $return = join('',@{$item{'comment(?)'}}) . $item{struct_or_union};
if ($identifier) { $return .= ", called $identifier, "; } if ($identifier) { $return .= " tagged $identifier"; }
$return .= " which contains the following:\n" . $item{struct_declaration_list}; $return .= " which contains the following:\n" . $item{struct_declaration_list};
} }
| struct_or_union identifier | struct_or_union identifier
{ {
$return = "the $item{struct_or_union} $item{identifier}"; $item{struct_or_union} =~ s/^(a|an)/the/;
$return = "$item{struct_or_union} $item{identifier}";
} }
struct_declaration_list: struct_declaration_list:
@ -1186,7 +1187,8 @@ struct_declaration_list:
} }
struct_declaration: struct_declaration:
comment(?) specifier_qualifier_list struct_declarator_list ';' specifier_qualifier_list ';'
| comment(?) specifier_qualifier_list struct_declarator_list ';'
{ $return = join('', @{$item{'comment(?)'}}) . $item{specifier_qualifier_list} . ' ' . $item{struct_declarator_list}; } { $return = join('', @{$item{'comment(?)'}}) . $item{specifier_qualifier_list} . ' ' . $item{struct_declarator_list}; }
type_name: type_name:
@ -1196,6 +1198,8 @@ type_name:
specifier_qualifier_list: specifier_qualifier_list:
type_specifier specifier_qualifier_list(?) type_specifier specifier_qualifier_list(?)
{ $return = $item{type_specifier} . join('', @{$item{'specifier_qualifier_list(?)'}}); } { $return = $item{type_specifier} . join('', @{$item{'specifier_qualifier_list(?)'}}); }
| type_specifier
{ $return = $item{type_specifier}; }
struct_declarator_list: struct_declarator_list:
struct_declarator struct_declarator
@ -1210,7 +1214,9 @@ struct_declarator:
struct_or_union: struct_or_union:
comment(?) ('struct' comment(?) ('struct'
{ $return = 'a structure'; } { $return = 'a structure'; }
| 'an union') comment(?) | 'union'
{ $return = 'an union'; }
) comment(?)
{ {
shift @item; shift @item;
foreach (@item) { foreach (@item) {
@ -1317,6 +1323,7 @@ integer_constant:
identifier_word: identifier_word:
/[a-z_\$][a-z0-9_]*/i /[a-z_\$][a-z0-9_]*/i
{ $return = "`$item[-1]`"; }
string: string:
/".*?[^\"]"/ # FIXME: doesn't handle escaped quotes /".*?[^\"]"/ # FIXME: doesn't handle escaped quotes