Perl 6 - the future is here, just unevenly distributed

IRC log for #6macros, 2015-10-13

| Channels | #6macros index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
01:48 ilbot3 joined #6macros
04:52 vendethiel joined #6macros
05:47 vendethiel joined #6macros
06:32 FROGGS joined #6macros
06:39 Ven joined #6macros
06:39 Ven ah, I'm stupid
06:39 Ven {a} was actually caught by some other rule
06:40 Ven {a()} needs to backtrack
06:42 Ven yeah, that was it. moving the rules around made it work
06:43 Ven masak: btw, any reason you use .ast because of .made?
06:44 Ven I'm biased, of course, because I'm the reason .made was added, but still :P
06:47 Ven > '{a() {}}' '(object (property (str "a") (block (parameters) (statements))))'
06:47 Ven this parses.
06:58 Ven joined #6macros
07:01 Ven joined #6macros
07:03 Ven joined #6macros
07:05 Ven_ joined #6macros
07:08 Ven joined #6macros
07:16 Ven joined #6macros
07:29 Ven_ joined #6macros
07:31 Ven joined #6macros
07:33 Ven joined #6macros
07:35 Ven joined #6macros
07:40 Ven joined #6macros
07:59 Ven_ joined #6macros
08:02 Ven joined #6macros
08:02 masak "moving the rules around made it work" -- this sounds weird. should be handled by LTM, no?
08:03 masak Ven: I think we want '{ a() {} }` to be a sub, not just a block.
08:04 Ven joined #6macros
08:05 masak Ven: I used .ast for a long time before .made appeared, and I didn't switch to .made because I didn't like to think of the thing as a past participle.
08:05 masak that is, I relate better to "an AST" than to "a made" (?)
08:05 Ven LTM can't handle that.
08:05 Ven it's { <identifier> } vs { <identifier> '()' }
08:05 Ven "made is what was 'return'ed by `make`"
08:06 masak yeah, I get why the name is the way it is.
08:06 masak still don't like the naming :)
08:06 masak for the reasons I stated above.
08:06 masak oh, maybe because <identifier> is not fully declarative, it can't do LTM
08:07 Ven yeah
08:07 Ven I know some people expect proto token to do `||` (maybe I do as well...)
08:07 Ven the commit I pushed works, though
08:07 Ven "only" missing Q types :P
08:08 * masak has a look
08:11 masak the diff is a bit hard to read, because it has some of my changes mixed into it
08:11 masak don't know if this is an artifact of you working against an old base or something
08:12 masak I still think we should call the thing 'property', not 'pair' -- the latter is not really a concept in 007, and if it were I'd expect pairs to be first-class like in Perl 6.
08:12 masak basically borrowing JS's terminology for object stuff, since the object literal syntax is quite similar.
08:13 masak also, in the Qtree Lisp DSL you already have it as 'property' :)
08:13 Ven some of your diffs, really?
08:14 masak the things under https://github.com/masak/007/pull/37
08:14 Ven I still hate git then. It's up to do date with your branch...
08:14 masak specifically https://github.com/vendethiel/007/commit/bde83da6827ed5e4069f61793b44bfeac7e4efcd#diff-5f9c5e70b669396a5a5c3278420921b3L146 is mine
08:14 Ven yeah, saw it now
08:14 Ven no idea. I don't know how to fix it.
08:23 masak I'm pretty good at Git, but I don't really know the steps you took to get my changes mixed up into your commits :) if I did, maybe I could help more...
08:23 Ven git fetch upstream && git merge upstream/master
08:24 masak ergh
08:24 masak I think you may want to rebase against upstream as long as you're on an unpushed WIP branch
08:24 Ven rebase just erased my changes
08:24 masak that doesn't sound right
08:24 Ven so I went with merge this time
08:25 masak I am unlikely to merge branches with "let's catch up with upstream" merges, too :)
08:25 * masak should write down his Git policy somewhere, in case there are more contributors
08:41 Ven joined #6macros
08:43 Ven_ joined #6macros
08:45 Ven joined #6macros
09:23 Ven yeah, I get that
09:23 Ven but outside from recreating a branch and cherry-picking...
09:23 Ven unless you know how to do :)
09:28 masak I can have a look
09:28 masak but at least from the Github side of things, it really looks like you got patches mixed up or something
09:28 masak never mind, I'll have a look and then get back to you
09:41 Ven joined #6macros
09:41 Ven well
09:41 Ven first, I stashed my changes, not to make a commit, but to keep them around before I rebased
09:41 Ven so I go around, rebase
09:42 Ven my changes were removed. I force-checkout the stash. nothing there anymore...
09:45 masak ok, I've pushed two branches for you
09:45 masak https://github.com/masak/007/tree/objliteral has the cleaned-up commits, without my changes
09:45 Ven well, care to explain how you did do that?
09:45 masak https://github.com/masak/007/tree/objliteral-squashed is the same, but as a single commit
09:46 masak sure
09:46 Ven I know how to squash with rebase -i, but ..:)
09:46 masak I rebased on latest master (something I needed to do anyway)
09:46 masak got a bunch of conflicts, handled them
09:46 masak kept doing rebase --continue
09:46 masak then went back and looked at the logs of the branch with `git log --reverse -p master..`
09:46 Ven ...eh?
09:46 Ven I merged with master, so huh.
09:47 masak found a commit marker still in there, and some other stuff that didn't belong
09:47 Ven Well – thanks.
09:47 masak went back and picked that out with rebase -i and edit
09:47 masak got some more conflicts, but nothing major
09:51 Ven alright. Well, I guess I delete my local branch and force-push yours
09:52 Ven You are currently rebasing branch 'objliteral' on 'e826215'.
09:52 Ven (all conflicts fixed: run "git rebase --continue")
09:52 Ven $ git rebase --continue
09:52 Ven Applying: Start working on object literals.
09:52 Ven No changes - did you forget to use 'git add'?
09:53 Ven and when I skip, there's nothing to push, rebase anymore, etc
09:54 masak don't force-push; reset --hard instead
09:55 Ven didn't do anything :)
09:55 Ven whatever
09:55 Ven I'll take your stuff
09:56 Ven I'll continue to work with my multi-commits, and I'll ultimately squash when you say "LGTM" :)
09:56 Ven boom. forcepushed. thansk
09:57 Ven s/sk/ks
10:01 masak oh, I meant `git checkout <your-branch>; reset --hard e826215` -- sorry for being unclear.
10:02 masak er, `git reset --hard e826215`
10:02 masak but just `git reset --hard` will indeed do nothing -- or rather, it'll nuke your uncommitted changes.
10:05 Ven yeah, I know that
10:05 masak lunch &
10:05 Ven I'm not *that* terrible with git :P. anyway it's pushed
10:08 masak :)
11:11 Ven joined #6macros
12:23 cgfbee joined #6macros
13:05 Ven_ joined #6macros
15:53 FROGGS joined #6macros
16:08 Ven joined #6macros
16:21 Ven joined #6macros
16:47 Ven joined #6macros
16:50 Ven joined #6macros
16:58 Ven_ joined #6macros
17:34 vendethiel joined #6macros
18:04 vendethiel joined #6macros
21:11 vendethiel oh, new github look

| Channels | #6macros index | Today | | Search | Google Search | Plain-Text | summary