Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

resolve merge conflict #694

Closed
wants to merge 1 commit into from

2 participants

@IngoHohmann

Somehow, my rebase seems not to have worked smoothly, so I created a new branch, and copied the file over.

As far as I can see, this should merge now flawlessly,

Should I close the older pull request?

@dockimbel
Owner

Hmm, actually I merged the older one already...It seems to work fine.

@dockimbel
Owner

I had to revert some unwanted changes in PR #693, but it seems fine now. All the changes from this PR seems already integrated. I let you check that and close this PR is all is ok now.

@IngoHohmann

Everything in here has already been merged. Closing

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 24, 2014
  1. @IngoHohmann

    resolve merge conflict

    IngoHohmann authored
This page is out of date. Refresh to see the latest.
Showing with 20 additions and 17 deletions.
  1. +20 −17 tests/help.red
View
37 tests/help.red
@@ -13,7 +13,7 @@ Red [
help: func [
"Get help for functions"
'word [any-type!] "Word you are looking for"
- /local func-name desc spec tab tab4 tab8 type start attributs info fun w ref block
+ /local func-name desc spec tab tab4 tab8 type start attributes info fun w ref block w1 w2
][
tab: tab4: " "
tab8: " "
@@ -44,7 +44,7 @@ Other debug functions:
foreach w system/words [
if type = type? get w [
case [
- any [function? get w native? get w action? get w][
+ any [function? get w native? get w action? get w op? get w][
prin [tab w]
spec: spec-of get w
@@ -72,7 +72,7 @@ Other debug functions:
argument-rule: [
set word [word! | lit-word! | get-word!]
- (prin [tab mold word])
+ (prin [tab mold :word])
opt [set type block! (prin [#" " mold type])]
opt [set info string! (prin [" =>" append form info dot])]
(prin lf)
@@ -81,27 +81,30 @@ Other debug functions:
either all [
word? func-name
fun: get func-name
- any [action? :fun function? :fun native? :fun]
+ any [action? :fun function? :fun native? :fun op? :fun]
][
- ; print ["^/" func-name "is of type" type? :fun newline]
- prin ["^/USAGE:^/" tab func-name]
+ prin ["^/USAGE:^/" tab ]
parse spec-of :fun [
- start: any [ ;-- 1st pass
- /local to end
- | set w word! (prin [" " w])
- | set w [lit-word! | refinement!] (prin [" " mold w])
- | skip
+ start: [ ;-- 1st pass
+ any [block! | string! ]
+ opt [set w [word! | lit-word! | get-word!] (either op? :fun [prin [mold w func-name]][prin [func-name mold w]])]
+ any [
+ /local to end
+ | set w [word! | lit-word! | get-word!] (prin [" " w])
+ | set w refinement! (prin [" " mold w])
+ | skip
+ ]
]
:start ;-- 2nd pass
- opt [set attributs block! (prin ["^/^/ATTRIBUTS:^/" tab mold attributs])]
- opt [set info string! (print ["^/^/DESCRIPTION:^/" tab append form info dot])]
+ opt [set attributes block! (prin ["^/^/ATTRIBUTES:^/" tab mold attributes])]
+ opt [set info string! (print ["^/^/DESCRIPTION:^/" tab append form info dot lf tab func-name "is type:" mold type? :fun])]
(print "^/ARGUMENTS:")
- any [argument-rule (prin lf)]
+ any [argument-rule]; (prin lf)]
- (print "REFINEMENTS:")
+ (print "^/REFINEMENTS:")
any [
/local [
to ahead set-word! 'return set block block!
@@ -135,13 +138,13 @@ what: function [
"Lists all functions, or words of a given type"
][
foreach w system/words [
- if any [function? get w native? get w action? get w][
+ if any [function? get w native? get w action? get w op? get w][
prin w
spec: spec-of get w
either any [
string? desc: spec/1
- string? desc: spec/2 ;-- attributs block case
+ string? desc: spec/2 ;-- attributes block case
][
print [tab "=> " desc]
][
Something went wrong with that request. Please try again.