Merge branch 'master' of ssh://git@github.com/perl6/std

perl6 · Oct 17, 2010 · ca5feb3 · ca5feb3
2 parents 4865b47 + 263c207
commit ca5feb3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/CORE.setting b/CORE.setting
@@ -230,7 +230,8 @@ my proto notdef {*}
 my proto undefine {*}
 my proto item {*}
 my proto list {*}
-my proto slice {*}
+my proto flat {*}
+my proto lol {*}
 my proto eager {*}
 my proto hyper {*}
 
@@ -372,7 +373,6 @@ my proto today {*}
 
 my proto gmtime {*}
 my proto localtime {*}
-my proto time {*}
 my proto times {*}
 my proto gethost {*}
 my proto getpw {*}

diff --git a/CursorBase.pmc b/CursorBase.pmc
@@ -247,7 +247,7 @@ sub sys_save_syml {
     pop @toks;
     my $path = File::Spec->catdir($::TMP_PREFIX, "syml", @toks);
 
-    File::Path::make_path($path);
+    File::Path::mkpath($path);
 
     open(SETTING, ">", $file) or die "Can't open new setting file $file: $!";
     print SETTING Dump($all);

diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ RM_RF=$(PERL) -MExtUtils::Command -e rm_rf
 CP=$(PERL) -MExtUtils::Command -e cp
 MV=$(PERL) -MExtUtils::Command -e mv
 MKDIR=mkdir
-SVN=svn
+GIT=git
 # no snaptest on win32 just yet
 CP_R=cp -r
 
@@ -55,7 +55,7 @@ reboot: six
 snap: all
 	$(RM_RF) snap.new
 	$(MKDIR) snap.new
-	$(SVN) info | $(PERL) -ne 'print "$$1\n" if /Revision:\s+(\d+)/' > snap.new/revision
+	$(GIT) log -1 --pretty="format:%h" > snap.new/revision
 	$(CP_R) $(INVARIANT) $(GENERATE) syml STD_P5.pmc lib tools/tryfile tools/teststd snap.new
 	-$(RM_RF) snap.old
 	-$(MV) snap snap.old

diff --git a/STD.pm6 b/STD.pm6
@@ -1698,7 +1698,7 @@ grammar P6 is STD {
     token package_declarator:require {   # here because of declarational aspects
         <sym> <.ws>
         [
-        || <module_name> <EXPR>?
+        || <module_name> <.ws> <EXPR>?
         || <EXPR>
         ]
     }
@@ -5923,6 +5923,10 @@ method panic (Str $s) {
 
     $m ~= $s;
 
+    if substr($*ORIG,$here.pos,1) ~~ /\)|\]|\}|\»/ {
+        $m ~~ s|Confused|Unexpected closing bracket| and $highvalid = False;
+    }
+
     if $highvalid {
         $m ~= $*HIGHMESS if $*HIGHMESS;
         $*HIGHMESS = $m;

diff --git a/std_hilite/cron_spec_highlight b/std_hilite/cron_spec_highlight
@@ -20,9 +20,9 @@ INTRO
 
 my $status;
 
-say "\n--Running 'svn update'";
-$status = system('cd ../../..; svn update'); 
-die "Could not svn update pugs\n" if $status != 0;
+say "\n--Running 'git pull' for std";
+$status = system('cd ..; git pull'); 
+die "Could not git pull for std\n" if $status != 0;
 
 say "\n--Running 'make clean all' for STD.pm";
 $status = system('cd ..; make clean all'); 
@@ -44,6 +44,6 @@ PATH=/bin:/usr/bin:/usr/local/bin
 LANG=en_US.UTF-8
 
 # m h  dom mon dow   command
-1 */3 * * *   (cd ~/pugs/src/perl6; ./cron_spec_highlight 2>&1 | tee html/log.txt)
+1 */5 * * *   (cd ~/std/std_hilite; ./cron_spec_highlight 2>&1 | tee html/log.txt)
 
 =cut