From ae24ace4c0535a261375e21af707befac3060ad9 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 17 Jan 2009 18:03:58 +0000
Subject: 	* interp/br-saturn.boot (htpMakeEmptyPage): Use deprecated
 GENTEMP 	instead of GENSYM. 	* interp/ht-util.boot (htpName):
 Likewise. 	(mkCurryFun): Likewise. 	(htRadioButtons): Likewise. 
 (htBcRadioButtons): Likewise 	* interp/br-con.boot (kisValidType): Use
 $LangSupportTypes.

---
 src/interp/br-con.boot    |  4 ++--
 src/interp/br-saturn.boot |  4 ++--
 src/interp/ht-util.boot   | 12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index 136bd104..bccb34df 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -679,7 +679,7 @@ kisValidType typeForm ==
   $ProcessInteractiveValue: fluid := true
   $noEvalTypeMsg: fluid := true
   CATCH($SpadReaderTag, processInteractive(typeForm,nil))
-    is [[h,:.],:t] and member(h,'(Domain SubDomain)) =>
+    is [m,:t] and member(m,$LangSupportTypes) =>
       kCheckArgumentNumbers t and t
   false
 
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 9c49cfad..e439d1ca 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -605,7 +605,7 @@ htInitPageNoHeading(propList) ==
 
 --------------------> NEW DEFINITION <--------------------------
 htpMakeEmptyPage(propList,:options) ==
-  name := IFCAR options or  GENSYM()
+  name := IFCAR options or GENTEMP()
   if not $saturn then
     $activePageList := [name, :$activePageList]
   setDynamicBinding(name, val := VECTOR(name, nil, nil, nil, nil, nil, propList, nil))
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index 477726fa..9c63e996 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -48,13 +48,15 @@ $curPage := nil
 -- List of currently active window named
 $activePageList := nil
 
+--%
+
 htpDestroyPage(pageName) ==
   pageName in $activePageList =>
     setDynamicBinding(pageName, nil)
     $activePageList := NREMOVE($activePageList, pageName)
 
 htpName htPage ==
--- GENSYM whose value is the page
+-- a symbol whose value is the page
   ELT(htPage, 0)
 
 htpSetName(htPage, val) ==
@@ -293,7 +295,7 @@ htLispMemoLinks(links) == htLispLinks(links,true)
 beforeAfter(x,u) == [[y for [y,:r] in tails u while x ^= y],r]
 
 mkCurryFun(fun, val) ==
-  name := GENSYM()
+  name := GENTEMP()
   code :=
     ['DEFUN, name, '(arg), ['APPLY, MKQ fun, ['CONS, 'arg, MKQ val]]]
   EVAL code
@@ -302,7 +304,7 @@ mkCurryFun(fun, val) ==
 htRadioButtons [groupName, :buttons] ==
   htpSetRadioButtonAlist($curPage, [[groupName, :buttonNames buttons],
                                     : htpRadioButtonAlist $curPage])
-  boxesName := GENSYM()
+  boxesName := GENTEMP()
   iht ['"\newline\indent{5}\radioboxes{", boxesName,
      '"}{\htbmfile{pick}}{\htbmfile{unpick}}\beginitems "]
   defaultValue := '"1"
@@ -320,7 +322,7 @@ htRadioButtons [groupName, :buttons] ==
 htBcRadioButtons [groupName, :buttons] ==
   htpSetRadioButtonAlist($curPage, [[groupName, :buttonNames buttons],
                                     : htpRadioButtonAlist $curPage])
-  boxesName := GENSYM()
+  boxesName := GENTEMP()
   iht ['"\radioboxes{", boxesName,
      '"}{\htbmfile{pick}}{\htbmfile{unpick}} "]
   defaultValue := '"1"
-- 
cgit v1.2.3