Renamed type to domain

js2/semantics/CalculusMarkup.lisp

@@ -197,7 +197,7 @@
   (when (eq link :reference)
     (setq link (tag-link tag)))
   (multiple-value-bind (link-name name) (tag-link-name-and-name tag)
-    (depict-link (markup-stream link "R-" link-name nil)
+    (depict-link (markup-stream link "T-" link-name nil)
       (depict-char-style (markup-stream :tag-name)
         (depict-item-or-list markup-stream name)))))
 
@@ -213,7 +213,7 @@
     (unless type-name
       (warn "Accessing field ~A of anonymous type ~S" label type)
       (setq link nil))
-    (depict-link (markup-stream link "T-" (symbol-upper-mixed-case-name type-name) nil)
+    (depict-link (markup-stream link "D-" (symbol-upper-mixed-case-name type-name) nil)
       (depict-char-style (markup-stream :field-name)
         (depict markup-stream (symbol-lower-mixed-case-name label))))))
 
@@ -239,8 +239,8 @@
 ;   nil          if this use of the type name should not be cross-referenced.
 (defun depict-type-name (markup-stream type-name link)
   (let ((name (symbol-upper-mixed-case-name type-name)))
-    (depict-link (markup-stream link "T-" name nil)
+    (depict-link (markup-stream link "D-" name nil)
-      (depict-char-style (markup-stream :type-name)
+      (depict-char-style (markup-stream :domain-name)
         (depict markup-stream name)))))
 
 

js2/semantics/HTML-To-RTF/Convert.lisp

@@ -139,8 +139,8 @@
     ("nonterminal-argument" . :nonterminal-argument)
     ("nonterminal-sub" . :nonterminal-sub)
     ("semantic-keyword" . :semantic-keyword)
-    ("type-name" . :type-name)
+    ("domain-name" . :domain-name)
-    ("type-sub" . :type-sub)
+    ("domain-sub" . :domain-sub)
     ("field-name" . :field-name)
     ("field-sub" . :field-sub)
     ("tag-name" . :tag-name)

js2/semantics/HTML.lisp

@@ -499,7 +499,7 @@
     (:nonterminal-argument (span (class "nonterminal-argument")))
     (:nonterminal-sub (span (class "nonterminal-sub")))
     (:semantic-keyword (span (class "semantic-keyword")))
-    (:type-name (span (class "type-name")))
+    (:domain-name (span (class "domain-name")))
     (:field-name (span (class "field-name")))
     (:tag-name (span (class "tag-name")))
     (:global-variable (span (class "global-variable")))

js2/semantics/RTF.lisp

@@ -365,14 +365,14 @@
     (:semantic-keyword cs :semantic-keyword-num b :times)
     ((+ :styles) (* :semantic-keyword additive sbasedon :default-paragraph-font-num "Semantic Keyword;"))
     
-    (:type-name-num 52)
+    (:domain-name-num 52)
-    (:type-name cs :type-name-num scaps :times :red :no-language)
+    (:domain-name cs :domain-name-num scaps :times :red :no-language)
-    ((+ :styles) (* :type-name additive sbasedon :default-paragraph-font-num "Type Name;"))
+    ((+ :styles) (* :domain-name additive sbasedon :default-paragraph-font-num "Domain Name;"))
-    (:type-name-index-entry v scaps :times :red :no-language)
+    (:domain-name-index-entry v scaps :times :red :no-language)
     
-    (:type-sub-num 53)
+    (:domain-sub-num 53)
-    (:type-sub cs :type-sub-num :red)
+    (:domain-sub cs :domain-sub-num :red)
-    ((+ :styles) (* :type-sub additive sbasedon :default-paragraph-font-num "Type Sub;"))
+    ((+ :styles) (* :domain-sub additive sbasedon :default-paragraph-font-num "Domain Sub;"))
     
     (:field-name-num 54)
     (:field-name cs :field-name-num :helvetica :no-language)
@@ -551,8 +551,8 @@
 
 (defparameter *rtf-link-prefixes*
   '(("N-" #\n :nonterminal-index-entry "Nonterminals")
-    ("R-" #\r :tag-name-index-entry "Tags")
+    ("T-" #\t :tag-name-index-entry "Tags")
-    ("T-" #\t :type-name-index-entry "Types")
+    ("D-" #\d :domain-name-index-entry "Semantic Domains")
     ("V-" #\v :global-variable-index-entry "Globals")))
 
 

js2/semantics/styles.css

@@ -63,10 +63,10 @@ A.nonterminal:active, .nonterminal A:active, A:active .nonterminal {color: #00FF
 .nonterminal-argument {color: #009900}
 .nonterminal-sub {color: #009900}
 .semantic-keyword {font-family: "Times New Roman", Times, serif; font-weight: bold}
-.type-name, A.type-name:link, A.type-name:visited {font-family: "Times New Roman", Times, serif; font-variant: small-caps; color: #CC0000}
+.domain-name, A.domain-name:link, A.domain-name:visited {font-family: "Times New Roman", Times, serif; font-variant: small-caps; color: #CC0000}
-A.type-name:hover, A:hover .type-name {color: #990000}
+A.domain-name:hover, A:hover .domain-name {color: #990000}
-A.type-name:active, A:active .type-name {color: #FF6666}
+A.domain-name:active, A:active .domain-name {color: #FF6666}
-.type-sub {color: #CC0000}
+.domain-sub {color: #CC0000}
 .tag-name, A.tag-name:link, A.tag-name:visited {font-family: Arial, Helvetica, sans-serif; font-weight: bold; color: #990000}
 A.tag-name:hover, A:hover .tag-name {color: #660000}
 A.tag-name:active, A:active .tag-name {color: #CC3333}