diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/boot/tokens.boot | 1 | ||||
| -rw-r--r-- | src/interp/br-saturn.boot | 16 |
3 files changed, 14 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 626f47f9..744e0454 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2013-06-15 Gabriel Dos Reis <gdr@integrable-solutions.net> + * boot/tokens.boot (importSymbol): New builtin. + * interp/br-saturn.boot (htpMakeEmptyPage): Use it. + +2013-06-15 Gabriel Dos Reis <gdr@integrable-solutions.net> + * interp/database.boot (dbConstructorDefault): New accessor. (getCategoryConstructorDefault): New. * interp/define.boot (makeCategoryAlist): Use it. diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot index fa340275..f8f7bc9e 100644 --- a/src/boot/tokens.boot +++ b/src/boot/tokens.boot @@ -298,6 +298,7 @@ for i in [ _ ["functionSymbol?", "FBOUNDP"] , _ ["gensym", "GENSYM"] , _ ["genvar", "GENVAR"] , _ + ["importSymbol", "IMPORT"] , _ ["inert?", "KEYWORDP"] , _ ["integer?","INTEGERP"] , _ ["LAST", "last"] , _ diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot index 34764f70..6f55c992 100644 --- a/src/interp/br-saturn.boot +++ b/src/interp/br-saturn.boot @@ -580,9 +580,9 @@ htInitPageNoScroll(propList, :options) == $saturnContextMenuLines := nil title := IFCAR options $curPage := - $standard => htpMakeEmptyPage(propList) + $standard => htpMakeEmptyPage propList nil - if $saturn then $saturnPage := htpMakeEmptyPage(propList) + if $saturn then $saturnPage := htpMakeEmptyPage propList $newPage := true $htLineList := nil if title then @@ -596,19 +596,19 @@ htInitPageNoScroll(propList, :options) == htInitPageNoHeading(propList) == --start defining a hyperTeX page $curPage := - $standard => htpMakeEmptyPage(propList) - if $saturn then $saturnPage := htpMakeEmptyPage(propList) + $standard => htpMakeEmptyPage propList + if $saturn then $saturnPage := htpMakeEmptyPage propList $newPage := true $htLineList := nil page() --------------------> NEW DEFINITION <-------------------------- -htpMakeEmptyPage(propList,:options) == - name := IFCAR options or gensym() +htpMakeEmptyPage propList == + name := gensym() + importSymbol name if not $saturn then $activePageList := [name, :$activePageList] - val := vector [name, nil, nil, nil, nil, nil, propList, nil] - symbolValue(name) := val + symbolValue(name) := vector [name, nil, nil, nil, nil, nil, propList, nil] --======================================================================= -- Redefinitions from br-con.boot |