From 65ed7768e597c315f94dadec2db7018d44533635 Mon Sep 17 00:00:00 2001 From: Moritz Lenz Date: Tue, 14 Sep 2010 17:58:56 +0200 Subject: [PATCH 1/7] write git sha1 to snap/revision --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 99905cb..2ebbbe9 100644 --- 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="%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 From 6beeb2e307a59fc050198226ba2a20763fa16a25 Mon Sep 17 00:00:00 2001 From: Moritz Lenz Date: Tue, 14 Sep 2010 18:00:14 +0200 Subject: [PATCH 2/7] use mkpath instead of make_path, for compatibility with older perls --- CursorBase.pmc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CursorBase.pmc b/CursorBase.pmc index 1518203..91c6546 100644 --- 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); From c656f61fa77e6401f18fa8ff894f60774a463776 Mon Sep 17 00:00:00 2001 From: TimToady Date: Wed, 15 Sep 2010 08:27:25 -0700 Subject: [PATCH 3/7] [CORE] delete time as a func; STD has it as term --- CORE.setting | 1 - 1 file changed, 1 deletion(-) diff --git a/CORE.setting b/CORE.setting index d3b6eb9..3cf868f 100644 --- a/CORE.setting +++ b/CORE.setting @@ -372,7 +372,6 @@ my proto today {*} my proto gmtime {*} my proto localtime {*} -my proto time {*} my proto times {*} my proto gethost {*} my proto getpw {*} From 87796e97ffef53470140c3a8261857e9a64c246f Mon Sep 17 00:00:00 2001 From: TimToady Date: Tue, 28 Sep 2010 10:29:03 -0700 Subject: [PATCH 4/7] [CORE] catch up with slice -> lol change, add flat --- CORE.setting | 3 ++- STD.pm6 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CORE.setting b/CORE.setting index 3cf868f..13e1934 100644 --- 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 {*} diff --git a/STD.pm6 b/STD.pm6 index 39c57da..28f63ff 100644 --- a/STD.pm6 +++ b/STD.pm6 @@ -1698,7 +1698,7 @@ grammar P6 is STD { token package_declarator:require { # here because of declarational aspects <.ws> [ - || ? + || <.ws> ? || ] } From 1d6fdf31dfc3536dfe425cc7b53d589871b0505d Mon Sep 17 00:00:00 2001 From: Moritz Lenz Date: Wed, 29 Sep 2010 21:47:50 +0200 Subject: [PATCH 5/7] fix revision file in "make snap" --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2ebbbe9..7127245 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ reboot: six snap: all $(RM_RF) snap.new $(MKDIR) snap.new - $(GIT) log -1 --pretty="%h" > 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 From 237d2669a885eb3b50180c882b007b492bd8299d Mon Sep 17 00:00:00 2001 From: TimToady Date: Fri, 1 Oct 2010 13:20:17 -0700 Subject: [PATCH 6/7] [STD] unexpected closing bracket message was LTA --- STD.pm6 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/STD.pm6 b/STD.pm6 index 28f63ff..cc3da41 100644 --- a/STD.pm6 +++ b/STD.pm6 @@ -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; From 263c207db8ab8cd2974c22327a6bfc1e5ec72f95 Mon Sep 17 00:00:00 2001 From: "Ahmad M. Zawawi" Date: Tue, 12 Oct 2010 09:34:27 +0200 Subject: [PATCH 7/7] [std_hilite] Use git instead of svn --- std_hilite/cron_spec_highlight | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/std_hilite/cron_spec_highlight b/std_hilite/cron_spec_highlight index a67c0b5..994a448 100755 --- 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