winapi: Simplify and improve the readability of the C parsers.

tools/winapi/c_function.pm

@@ -22,7 +22,7 @@ use strict;
 
 sub new($)
 {
-    my $proto = shift;
+    my ($proto) = @_;
     my $class = ref($proto) || $proto;
     my $self  = {};
     bless ($self, $class);
@@ -37,170 +37,100 @@ sub new($)
 
 sub file($;$)
 {
-    my $self = shift;
-    my $file = \${$self->{FILE}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$file = $_; }
-
-    return $$file;
+    my ($self, $filename) = @_;
+    $self->{file} = $filename if (defined $filename);
+    return $self->{file};
 }
 
-sub begin_line($;$)
+sub begin_line($$)
 {
-    my $self = shift;
-    my $begin_line = \${$self->{BEGIN_LINE}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$begin_line = $_; }
-
-    return $$begin_line;
+    my ($self, $begin_line) = @_;
+    $self->{begin_line} = $begin_line if (defined $begin_line);
+    return $self->{begin_line};
 }
 
 sub begin_column($;$)
 {
-    my $self = shift;
-    my $begin_column = \${$self->{BEGIN_COLUMN}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$begin_column = $_; }
-
-    return $$begin_column;
+    my ($self, $begin_column) = @_;
+    $self->{begin_column} = $begin_column if (defined $begin_column);
+    return $self->{begin_column};
 }
 
 sub end_line($;$)
 {
-    my $self = shift;
-    my $end_line = \${$self->{END_LINE}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$end_line = $_; }
-
-    return $$end_line;
+    my ($self, $end_line) = @_;
+    $self->{end_line} = $end_line if (defined $end_line);
+    return $self->{end_line};
 }
 
 sub end_column($;$)
 {
-    my $self = shift;
-    my $end_column = \${$self->{END_COLUMN}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$end_column = $_; }
-
-    return $$end_column;
+    my ($self, $end_column) = @_;
+    $self->{end_column} = $end_column if (defined $end_column);
+    return $self->{end_column};
 }
 
 sub linkage($;$)
 {
-    my $self = shift;
-    my $linkage = \${$self->{LINKAGE}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$linkage = $_; }
-
-    return $$linkage;
+    my ($self, $linkage) = @_;
+    $self->{linkage} = $linkage if (defined $linkage);
+    return $self->{linkage};
 }
 
 sub return_type($;$)
 {
-    my $self = shift;
-    my $return_type = \${$self->{RETURN_TYPE}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$return_type = $_; }
-
-    return $$return_type;
+     my ($self, $return_type) = @_;
+    $self->{return_type} = $return_type if (defined $return_type);
+    return $self->{return_type};
 }
 
 sub calling_convention($;$)
 {
-    my $self = shift;
-    my $calling_convention = \${$self->{CALLING_CONVENTION}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$calling_convention = $_; }
-
-    return $$calling_convention;
+    my ($self, $calling_convention) = @_;
+    $self->{calling_convention} = $calling_convention if (defined $calling_convention);
+    return $self->{calling_convention};
 }
 
 sub name($;$)
 {
-    my $self = shift;
-    my $name = \${$self->{NAME}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$name = $_; }
-
-    return $$name;
+    my ($self, $name) = @_;
+    $self->{name} = $name if (defined $name);
+    return $self->{name};
 }
 
 sub argument_types($;$)
 {
-    my $self = shift;
-    my $argument_types = \${$self->{ARGUMENT_TYPES}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$argument_types = $_; }
-
-    return $$argument_types;
+    my ($self, $argument_types) = @_;
+    $self->{argument_types} = $argument_types if (defined $argument_types);
+    return $self->{argument_types};
 }
 
 sub argument_names($;$)
 {
-    my $self = shift;
-    my $argument_names = \${$self->{ARGUMENT_NAMES}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$argument_names = $_; }
-
-    return $$argument_names;
+    my ($self, $argument_names) = @_;
+    $self->{argument_names} = $argument_names if (defined $argument_names);
+    return $self->{argument_names};
 }
 
 sub statements_line($;$)
 {
-    my $self = shift;
-    my $statements_line = \${$self->{STATEMENTS_LINE}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$statements_line = $_; }
-
-    return $$statements_line;
+    my ($self, $statements_line) = @_;
+    $self->{statements_line} = $statements_line if (defined $statements_line);
+    return $self->{statements_line};
 }
 
 sub statements_column($;$)
 {
-    my $self = shift;
-    my $statements_column = \${$self->{STATEMENTS_COLUMN}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$statements_column = $_; }
-
-    return $$statements_column;
+    my ($self, $statements_column) = @_;
+    $self->{statements_column} = $statements_column if (defined $statements_column);
+    return $self->{statements_column};
 }
 
 sub statements($;$)
 {
-    my $self = shift;
-    my $statements = \${$self->{STATEMENTS}};
-
-    local $_ = shift;
-
-    if(defined($_)) { $$statements = $_; }
-
-    return $$statements;
+    my ($self, $statements) = @_;
+    $self->{statements} = $statements if (defined $statements);
+    return $self->{statements};
 }
 
 1;