Skip to content

Commit

Permalink
"Theirs" merge with Marpa-R2-2.035_003
Browse files Browse the repository at this point in the history
  • Loading branch information
- committed Jan 2, 2013
2 parents 4aab2dd + c0d78de commit 489c57a
Show file tree
Hide file tree
Showing 16 changed files with 66 additions and 50 deletions.
22 changes: 19 additions & 3 deletions r2/Changes
View file
Expand Up @@ -15,10 +15,26 @@

Revision history for Marpa::R2

2.036000 Tue Jan 1 00:54:36 PST 2013
2.035_003
* Release candidate. The Scanless G0 rule
order depended indirectly on the order of
keys in a Perl hash. Fixed that.

2.035_002

* Documentation for the Stuifzand (BNF) and
Scanless interfaces is complete.
* Release candidate. Documentation for both
the Stuifzand and Scanless interfaces is
complete.

2.035_001
2.035_000

* New series of developer's releases.

2.033_004 (leap-frogged)

* Release candidate. Stuifzand interface is documented
and ready for full release.

2.034000 Wed Dec 26 08:44:16 PST 2012

Expand Down
24 changes: 12 additions & 12 deletions r2/META.json
View file
Expand Up @@ -86,19 +86,19 @@
"provides" : {
"Marpa::R2" : {
"file" : "lib/Marpa/R2.pm",
"version" : "2.036000"
"version" : "2.035_003"
},
"Marpa::R2::Grammar" : {
"file" : "lib/Marpa/R2/Grammar.pm",
"version" : "2.036000"
"version" : "2.035_003"
},
"Marpa::R2::HTML" : {
"file" : "html/lib/Marpa/R2/HTML.pm",
"version" : "2.036000"
"version" : "2.035_003"
},
"Marpa::R2::HTML::Callback" : {
"file" : "html/lib/Marpa/R2/HTML/Callback.pm",
"version" : "2.036000"
"version" : "2.035_003"
},
"Marpa::R2::HTML::Config" : {
"file" : "html/lib/Marpa/R2/HTML/Config.pm",
Expand Down Expand Up @@ -138,7 +138,7 @@
},
"Marpa::R2::Internal" : {
"file" : "lib/Marpa/R2/Internal.pm",
"version" : "2.036000"
"version" : "2.035_003"
},
"Marpa::R2::Internal::Grammar" : {
"file" : "lib/Marpa/R2/Grammar.pm",
Expand Down Expand Up @@ -166,30 +166,30 @@
},
"Marpa::R2::Recognizer" : {
"file" : "lib/Marpa/R2/Recognizer.pm",
"version" : "2.036000"
"version" : "2.035_003"
},
"Marpa::R2::Scanless" : {
"file" : "lib/Marpa/R2/Scanless.pm",
"version" : "2.036000"
"version" : "2.035_003"
},
"Marpa::R2::Stuifzand" : {
"file" : "lib/Marpa/R2/Stuifzand.pm",
"version" : "2.036000"
"version" : "2.035_003"
},
"Marpa::R2::Thin::Trace" : {
"file" : "lib/Marpa/R2/Thin/Trace.pm",
"version" : "2.036000"
"version" : "2.035_003"
},
"Marpa::R2::Value" : {
"file" : "lib/Marpa/R2/Value.pm",
"version" : "2.036000"
"version" : "2.035_003"
}
},
"release_status" : "stable",
"release_status" : "testing",
"resources" : {
"repository" : {
"url" : "git://github.com/jeffreykegler/Marpa-R2.git"
}
},
"version" : "2.036000"
"version" : "2.035_003"
}
22 changes: 11 additions & 11 deletions r2/META.yml
View file
Expand Up @@ -55,16 +55,16 @@ no_index:
provides:
Marpa::R2:
file: lib/Marpa/R2.pm
version: 2.036000
version: 2.035_003
Marpa::R2::Grammar:
file: lib/Marpa/R2/Grammar.pm
version: 2.036000
version: 2.035_003
Marpa::R2::HTML:
file: html/lib/Marpa/R2/HTML.pm
version: 2.036000
version: 2.035_003
Marpa::R2::HTML::Callback:
file: html/lib/Marpa/R2/HTML/Callback.pm
version: 2.036000
version: 2.035_003
Marpa::R2::HTML::Config:
file: html/lib/Marpa/R2/HTML/Config.pm
version: 0
Expand Down Expand Up @@ -94,7 +94,7 @@ provides:
version: 0
Marpa::R2::Internal:
file: lib/Marpa/R2/Internal.pm
version: 2.036000
version: 2.035_003
Marpa::R2::Internal::Grammar:
file: lib/Marpa/R2/Grammar.pm
version: 0
Expand All @@ -115,19 +115,19 @@ provides:
version: 0
Marpa::R2::Recognizer:
file: lib/Marpa/R2/Recognizer.pm
version: 2.036000
version: 2.035_003
Marpa::R2::Scanless:
file: lib/Marpa/R2/Scanless.pm
version: 2.036000
version: 2.035_003
Marpa::R2::Stuifzand:
file: lib/Marpa/R2/Stuifzand.pm
version: 2.036000
version: 2.035_003
Marpa::R2::Thin::Trace:
file: lib/Marpa/R2/Thin/Trace.pm
version: 2.036000
version: 2.035_003
Marpa::R2::Value:
file: lib/Marpa/R2/Value.pm
version: 2.036000
version: 2.035_003
recommends:
Config::AutoConf: 0.22
ExtUtils::MakeMaker: 0
Expand All @@ -141,4 +141,4 @@ requires:
Scalar::Util: 1.21
resources:
repository: git://github.com/jeffreykegler/Marpa-R2.git
version: 2.036000
version: 2.035_003
2 changes: 1 addition & 1 deletion r2/html/lib/Marpa/R2/HTML.pm
View file
Expand Up @@ -20,7 +20,7 @@ use strict;
use warnings;

use vars qw( $VERSION $STRING_VERSION );
$VERSION = '2.036000';
$VERSION = '2.035_003';
$STRING_VERSION = $VERSION;
## no critic (BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
Expand Down
2 changes: 1 addition & 1 deletion r2/html/lib/Marpa/R2/HTML/Callback.pm
View file
Expand Up @@ -20,7 +20,7 @@ use strict;
package Marpa::R2::HTML::Callback;

use vars qw( $VERSION $STRING_VERSION );
$VERSION = '2.036000';
$VERSION = '2.035_003';
$STRING_VERSION = $VERSION;
## use critic (BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
Expand Down
2 changes: 1 addition & 1 deletion r2/lib/Marpa/R2.pm
View file
Expand Up @@ -20,7 +20,7 @@ use strict;
use warnings;

use vars qw($VERSION $STRING_VERSION @ISA $DEBUG);
$VERSION = '2.036000';
$VERSION = '2.035_003';
$STRING_VERSION = $VERSION;
## no critic (BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
Expand Down
2 changes: 1 addition & 1 deletion r2/lib/Marpa/R2/Grammar.pm
View file
Expand Up @@ -28,7 +28,7 @@ no warnings qw(recursion qw);
use strict;

use vars qw($VERSION $STRING_VERSION);
$VERSION = '2.036000';
$VERSION = '2.035_003';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
Expand Down
2 changes: 1 addition & 1 deletion r2/lib/Marpa/R2/Internal.pm
View file
Expand Up @@ -21,7 +21,7 @@ use warnings;
use Carp;

use vars qw($VERSION $STRING_VERSION);
$VERSION = '2.036000';
$VERSION = '2.035_003';
$STRING_VERSION = $VERSION;
## no critic (BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
Expand Down
2 changes: 1 addition & 1 deletion r2/lib/Marpa/R2/Recognizer.pm
View file
Expand Up @@ -21,7 +21,7 @@ use strict;
use English qw( -no_match_vars );

use vars qw($VERSION $STRING_VERSION);
$VERSION = '2.036000';
$VERSION = '2.035_003';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
Expand Down
4 changes: 2 additions & 2 deletions r2/lib/Marpa/R2/Scanless.pm
View file
Expand Up @@ -20,7 +20,7 @@ use strict;
use warnings;

use vars qw($VERSION $STRING_VERSION);
$VERSION = '2.036000';
$VERSION = '2.035_003';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
Expand Down Expand Up @@ -2429,7 +2429,7 @@ sub Marpa::R2::Scanless::G::_source_to_hash {
Marpa::R2::exception("Unproductive lexical symbols: ", join q{ }, @unproductive);
}
push @{ $inner_self->{lex_rules} },
map { ; { lhs => '[:start_lex]', rhs => [$_] } } keys %lexemes;
map { ; { lhs => '[:start_lex]', rhs => [$_] } } sort keys %lexemes;

my $raw_cc = $inner_self->{character_classes};
if ( defined $raw_cc ) {
Expand Down
2 changes: 1 addition & 1 deletion r2/lib/Marpa/R2/Stuifzand.pm
View file
Expand Up @@ -20,7 +20,7 @@ use strict;
use warnings;

use vars qw($VERSION $STRING_VERSION);
$VERSION = '2.036000';
$VERSION = '2.035_003';
$STRING_VERSION = $VERSION;
## no critic(BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
Expand Down
2 changes: 1 addition & 1 deletion r2/lib/Marpa/R2/Thin/Trace.pm
View file
Expand Up @@ -20,7 +20,7 @@ use warnings;
use strict;

use vars qw($VERSION $STRING_VERSION);
$VERSION = '2.036000';
$VERSION = '2.035_003';
$STRING_VERSION = $VERSION;
$VERSION = eval $VERSION;

Expand Down
2 changes: 1 addition & 1 deletion r2/lib/Marpa/R2/Value.pm
View file
Expand Up @@ -20,7 +20,7 @@ use warnings;
use strict;

use vars qw($VERSION $STRING_VERSION);
$VERSION = '2.036000';
$VERSION = '2.035_003';
$STRING_VERSION = $VERSION;
## no critic (BuiltinFunctions::ProhibitStringyEval)
$VERSION = eval $VERSION;
Expand Down
4 changes: 2 additions & 2 deletions r2/libmarpa/dev/dist/configure.ac
View file
Expand Up @@ -32,8 +32,8 @@ m4_define(marpa_configure_in)
# set marpa_binary_age _and_ marpa_interface_age to 0.
#
m4_define([marpa_major_version], [2])
m4_define([marpa_minor_version], [36])
m4_define([marpa_micro_version], [0])
m4_define([marpa_minor_version], [35])
m4_define([marpa_micro_version], [3])
m4_define([marpa_interface_age], [100])
m4_define([marpa_binary_age],
[m4_eval(100 * marpa_minor_version + marpa_micro_version)])
Expand Down
4 changes: 2 additions & 2 deletions r2/libmarpa/dev/doc_dist/configure.ac
View file
Expand Up @@ -32,8 +32,8 @@ m4_define(marpa_configure_in)
# set marpa_binary_age _and_ marpa_interface_age to 0.
#
m4_define([marpa_major_version], [2])
m4_define([marpa_minor_version], [36])
m4_define([marpa_micro_version], [0])
m4_define([marpa_minor_version], [35])
m4_define([marpa_micro_version], [3])
m4_define([marpa_interface_age], [100])
m4_define([marpa_binary_age],
[m4_eval(100 * marpa_minor_version + marpa_micro_version)])
Expand Down
18 changes: 9 additions & 9 deletions r2/t/sl_gsyn.t
View file
Expand Up @@ -96,16 +96,16 @@ Lex (G0) Rules:
16: hash comment body -> hash comment char*
17: vertical space char -> [[\x{A}\x{B}\x{C}\x{D}\x{2028}\x{2029}]]
18: hash comment char -> [[^\x{A}\x{B}\x{C}\x{D}\x{2028}\x{2029}]]
19: [:start_lex] -> [Lex-1]
20: [:start_lex] -> comma
21: [:start_lex] -> [Lex-3]
22: [:start_lex] -> [Lex-5]
19: [:start_lex] -> Number
20: [:start_lex] -> [:discard]
21: [:start_lex] -> [Lex-0]
22: [:start_lex] -> [Lex-1]
23: [:start_lex] -> [Lex-2]
24: [:start_lex] -> Number
25: [:start_lex] -> [:discard]
26: [:start_lex] -> [Lex-6]
27: [:start_lex] -> [Lex-4]
28: [:start_lex] -> [Lex-0]
24: [:start_lex] -> [Lex-3]
25: [:start_lex] -> [Lex-4]
26: [:start_lex] -> [Lex-5]
27: [:start_lex] -> [Lex-6]
28: [:start_lex] -> comma
G1 Rules:
0: [:start] -> Script
1: Script -> Expression+ /* discard_sep */
Expand Down

0 comments on commit 489c57a

Please sign in to comment.