Changeset 8465

Timestamp:

Feb 11, 2008, 8:07:20 AM (17 years ago)

Author:

gz

Message:

Update to trunk rev 8464

Location:

branches/gz-working

Files:

• compiler/X86/x862.lisp (modified) (3 diffs)
• compiler/nx-basic.lisp (modified) (1 diff)
• examples/cocoa/currency-converter/CurrencyConverter.xib (deleted)
• examples/cocoa/currency-converter/HOWTO.html (modified) (4 diffs)
• examples/cocoa/currency-converter/HOWTO_files/pages/build_app.html (modified) (2 diffs)
• examples/cocoa/currency-converter/HOWTO_files/pages/building_ui.html (modified) (11 diffs)
• examples/cocoa/currency-converter/HOWTO_files/pages/building_ui_tiger.html (modified) (12 diffs)
• examples/cocoa/currency-converter/HOWTO_files/pages/conclusion.html (modified) (3 diffs)
• examples/cocoa/currency-converter/HOWTO_files/pages/writing_lisp.html (modified) (8 diffs)
• examples/cocoa/interface-databases (copied) (copied from trunk/source/examples/cocoa/interface-databases )
• examples/cocoa/nib-loading (copied) (copied from trunk/source/examples/cocoa/nib-loading )
• lib/backtrace.lisp (modified) (1 diff)
• lisp-kernel/x86-exceptions.c (modified) (1 diff)

branches/gz-working/compiler/X86/x862.lisp

@@ -4958 +4958 @@
          (cstack *x862-cstack*)
          (vstack *x862-vstack*)
-         (target-cstack)
          (target-vstack)
          (lastcatch n)
-         (i nil)
          (returning (eq xfer $backend-return))
          (junk1 nil)
@@ -4991 +4989 @@
                      (setq numnthrow 0)
                      (multiple-value-setq (junk1 cstack vstack)
-                       (x862-decode-stack (aref *x862-undo-stack* lastcatch))))))
+                       (x862-decode-stack (aref *x862-undo-stack* lastcatch)))))
+                 (find-last-catch ()
+                   (do* ((n n)
+                         (reasons *x862-undo-because*))
+                        ((= n dest))
+                     (declare (fixnum n))
+                     (when (eql $undocatch (aref reasons (decf n)))
+                       (incf numnthrow)
+                       (setq lastcatch n)))))
+                            
+            (find-last-catch)
+            (throw-through-numnthrow-catch-frames)
+            (setq n lastcatch)
             (while (%i> n dest)
-              (cond ((eql $undocatch (setq reason (aref *x862-undo-because* (setq n (%i- n 1)))))
-                     (pop-temp-frames)
-                     (pop-c-frames)
-                     (setq numnthrow (%i+ numnthrow 1) lastcatch n))
-                    ((eql $undostkblk reason)
-                     (throw-through-numnthrow-catch-frames)
+              (setq reason (aref *x862-undo-because* (setq n (%i- n 1))))
+              (cond ((eql $undostkblk reason)
                      (incf num-temp-frames))
                     ((eql $undo-x86-c-frame reason)
-                     (throw-through-numnthrow-catch-frames)
-                     (incf num-c-frames))))
-            (throw-through-numnthrow-catch-frames)
-            (setq i lastcatch)
-            (while (%i> i dest)
-              (let ((reason (aref *x862-undo-because* (setq i (%i- i 1)))))
-                (if (or (eql reason $undospecial)
+                     (incf num-c-frames))
+                    ((or (eql reason $undospecial)
                         (eql reason $undointerruptlevel))
                   (push reason unbind))))
@@ -5027 +5028 @@
                       (! slide-values))
                     (! adjust-vsp vdiff)))))
-            (setq num-temp-frames 0 num-c-frames 0)
-            (while (%i> lastcatch dest)
-              (let ((reason (aref *x862-undo-because* (setq lastcatch (%i- lastcatch 1)))))
-                (setq target-cstack (nth-value 1
-                                               (x862-decode-stack (aref *x862-undo-stack* lastcatch))))
-                (if (eq reason $undostkblk)
-                  (incf num-temp-frames))
-                (if (eq reason $undo-x86-c-frame)
-                  (incf num-c-frames))
-                (if (%i> cstack target-cstack)
-                  (compiler-bug "bug: adjust foreign stack ??"))
-                ;; else what's going on? $sp-stkcons, for one thing
-                (setq cstack target-cstack)))
             (pop-temp-frames)
             (pop-c-frames)))

branches/gz-working/compiler/nx-basic.lisp

@@ -481 +481 @@
         (format stream " (~D references)" nrefs)))
     (princ ", in " stream)
-    (print-nested-name (reverse (compiler-warning-function-name condition)) stream)
-    (princ "." stream)))
+    (print-nested-name (reverse (compiler-warning-function-name condition)) stream)))
 
 (defun environment-structref-info (name env)

branches/gz-working/examples/cocoa/currency-converter/HOWTO.html

@@ -20 +20 @@
       </h2></div>
 
-    <div class="subtitle">
-      <img src="HOWTO_files/images/bosco.jpg"
-           width="48" height="48" border="0" alt="" 
-           border='0'/>
-    </div>
-
-    <div class="byline">
-      <p>by mikel evins</p>
-    </div>
 
     <div class="body-text">
@@ -38 +29 @@
         Currency Converter</a> example. The most important
         difference between Apple's example and this one is that this
-        one is implemented in Common Lisp instead of Objective C. It
+        one is implemented in Common Lisp instead of Objective-C. It
         uses Clozure CL's Objective-C bridge to provide communication
         between the Lisp code that you write and Apple's Cocoa
@@ -50 +41 @@
       Apple's InterfaceBuilder application and Clozure CL.</p>
 
+      <p>An observant programmer will look at the code in this example
+      and say, "well, that's trivial! Why create all those classes and
+      connections and so forth just to perform a multiplcation?" That
+      observation is correct: the actual work done by the Currency
+      Converter application is trivial&mdash;both in the Lisp and the
+      Objective-C versions. The point of this example (and Apple's) is
+      not to show you how to perform a multiplication. The point is to
+      show you how Apple's frameworks implement and support the
+      Model-View-Controller paradigm, and how you can use that support
+      to build Cocoa applications. In fact, the work done by the
+      application is <em>intentionally trivial</em>, to emphasize the
+      frameworks rather than the particulars of the application.</p> 
+
+      <p>This HOWTO has the additional purpose of showing you how
+      Clozure CL makes it possible to do exactly the same thing in
+      Lisp that you can do with Objective-C, so that you will
+      understand how to use Lisp with Apple's frameworks.</p>
+
       <p>The current version of the Clozure CL Objective-C bridge
       includes code that was formerly distributed separately as the
       "Bosco" application framework. Because that framework has been
       integrated with Clozure CL proper, it no longer exists as a
-      separate project. "Bosco" now names only the decorative rodent
-      at the top of this page.</p>
+      separate project.</p>
     </div>
 
@@ -71 +79 @@
 
       <p>In some ways, the Lisp version of the example is simpler
-      than the Objective C example, but the basic concepts are the
+      than the Objective-C example, but the basic concepts are the
       same. In particular, the Lisp example follows the same
       <a

branches/gz-working/examples/cocoa/currency-converter/HOWTO_files/pages/build_app.html

@@ -18 +18 @@
       do is to build the application executable into a Cocoa
       application bundle. Apple's tutorial relies on XCode to build
-      the application from Objective C source files; we will use the
+      the application from Objective-C source files; we will use the
       Clozure CL IDE to build it from our Lisp source file.</p>
 
@@ -25 +25 @@
       steps to build the Cocoa application are:</p>
 
-      <ul>
+      <ol>
         <li><p>Load the application code into the IDE</p></li>
         <li><p>Load the BUILD_APPLICATION feature</p></li>
         <li><p>Run BUILD_APPLICATION with the proper arguments</p></li>
-      </ul>
+      </ol>
 
       <p>This sequence of steps causes Clozure CL to construct a Cocoa

branches/gz-working/examples/cocoa/currency-converter/HOWTO_files/pages/building_ui.html

@@ -36 +36 @@
       <p>We'll begin by using Apple's InterfaceBuilder application to
         create a nibfile. The nibfile contains
-        archived versions of the Objective C objects that define the
+        archived versions of the Objective-C objects that define the
         application's user interface. When you launch an application,
         Mac OS X uses the archived objects in the nibfile to create the
@@ -70 +70 @@
         create an application nibfile. InterfaceBuilder creates a new
         application nibfile, but doesn't immediately save it. The
-        Objective C objects that represent the new application's
+        Objective-C objects that represent the new application's
         interface appear in a new untitled window:</p>
 
@@ -91 +91 @@
 
       <div class="note">
-        <p><strong><em>NOTE:</em></strong> Most Objective C application projects use a main
+        <p><strong><em>NOTE:</em></strong> Most Objective-C application projects use a main
         nibfile called "MainMenu.nib", and if you use XCode to create
         a new application project, it creates a nibfile with that
@@ -108 +108 @@
           Clozure CL main nibfile without causing any problems.</p>
 
-        <p>This difference between a Lisp project and an Objective C
+        <p>This difference between a Lisp project and an Objective-C
         project might be a little confusing at first. Just try to keep
         in mind that whenever Apple's tutorial refers to the
@@ -120 +120 @@
 <p>Skip straight to the part of Apple's tutorial
 called <a href="http://developer.apple.com/documentation/Cocoa/Conceptual/ObjCTutorial/05View/chapter_5_section_1.html#//apple_ref/doc/uid/TP40000863-CH7-SW1">Defining
-    the View: Building the User Interface</a>. Read
-  the introduction to
+the View: Building the User Interface</a>. Read the introduction to
 nibfiles, and follow the instructions to create the Currency Converter
 interface. (Remember that when the tutorial tells you to open and edit
@@ -127 +126 @@
 "CurrencyConverter.nib".) When you reach the end of the section
 called <a href="http://developer.apple.com/documentation/Cocoa/Conceptual/ObjCTutorial/05View/chapter_5_section_5.html#//apple_ref/doc/uid/TP40000863-CH7-DontLinkElementID_38">Test
-    the Interface</a>, and move on to the short section afterward
-  called <a href="http://developer.apple.com/documentation/Cocoa/Conceptual/ObjCTutorial/05View/chapter_5_section_6.html#//apple_ref/doc/uid/TP40000863-CH7-DontLinkElementID_39">What's Next</a>,
-  you are done creating the interface for your
-application. Save your nibfile and continue with the next section.</p>
+the Interface</a>, and move on to the short section afterward
+called <a href="http://developer.apple.com/documentation/Cocoa/Conceptual/ObjCTutorial/05View/chapter_5_section_6.html#//apple_ref/doc/uid/TP40000863-CH7-DontLinkElementID_39">What's
+Next</a>, you are done creating the interface for your
+application. Save your nibfile and continue with the next section of
+this HOWTO.</p>
 
 <div class="section-head">
@@ -153 +153 @@
 <p>One other thing: if you are using Mac OS X 10.4.x ("Tiger"), you
   will be able to build Cocoa applications only on PPC Macs. The
-  Clozure CL Objective C support for Intel systems works only on Mac
+  Clozure CL Objective-C support for Intel systems works only on Mac
   OS X 10.5.x ("Leopard").</p>
 
@@ -167 +167 @@
   connections in place.</p>
 
-<p>When you use XCode to write an Objective C application,
-  InterfaceBuilder can read the Objective C header files and use the
+<p>When you use XCode to write an Objective-C application,
+  InterfaceBuilder can read the Objective-C header files and use the
   information in them to create descriptions of the classes in the
-  Objective C code. When the application is written in Lisp,
+  Objective-C code. When the application is written in Lisp,
   InterfaceBuilder can't read the class descriptions from the code,
   and so we'll have to manually tell the nibfile about any classes
@@ -176 +176 @@
 
 <p>As you will see in the following sections, we'll use Lisp code to
-  define two Objective C classes: Converter, and
+  define two Objective-C classes: Converter, and
   ConverterController. The Converter class implements the method that
   performs the actual currency conversion for our application; the
   ConverterController class provides communication between the user
-  interface and the Converter object. We need a way to create instaces
-  of these two classes in the nibfile, so that launching the
-  application creates these instances and the connections between them
-  and the rest of the user interface.</p>
+  interface and the Converter object. We need a way to create
+  instances of these two classes in the nibfile, so that launching the
+  application sets up all the objects correctly.</p>
 
 <div class="section-head">
@@ -241 +240 @@
       </div>
 
-<p>We'll connect each of the "field" outlets to one of the text
-  fields in the CurrencyConverter UI, and we'll connect the
-  "converter" outlet to the Converter instance that we created
-  before. When the application launches, it creates the Converter and
+<p>We'll connect each of the "field" outlets to one of the text fields
+  in the CurrencyConverter UI, and we'll connect the "converter"
+  outlet to the Converter instance that we created before. When the
+  application launches, it creates the Converter and
   ConverterController instances and establishes the connections that
-  we specify in the nibfile.</p>
+  we've specified in the nibfile.</p>
 
 
@@ -264 +263 @@
   outlets.</p>
 
-<p>Now we'll connect outlets to objects and actions.</p>
+<p>Now we'll connect outlets and actions to objects.</p>
 
 <div class="section-head">

branches/gz-working/examples/cocoa/currency-converter/HOWTO_files/pages/building_ui_tiger.html

@@ -55 +55 @@
       section and click the "New" button to create a new
       nibfile. InterfaceBuilder creates a new application nibfile, but
-      doesn't immediately save it. The Objective C objects that
+      doesn't immediately save it. The Objective-C objects that
       represent the new application's interface appear in a new
       untitled window:</p>
@@ -72 +72 @@
 
       <div class="note">
-        <p><strong><em>NOTE:</em></strong> Most Objective C application projects use a main
+        <p><strong><em>NOTE:</em></strong> Most Objective-C application projects use a main
         nibfile called "MainMenu.nib", and if you use XCode to create
         a new application project, it creates a nibfile with that
@@ -89 +89 @@
           Clozure CL main nibfile without causing any problems.</p>
 
-        <p>This difference between a Lisp project and an Objective C
+        <p>This difference between a Lisp project and an Objective-C
         project might be a little confusing at first. Just try to keep
         in mind that whenever Apple's tutorial refers to the
@@ -183 +183 @@
       </div>
 
-      <p>Now add labels to the text fields, to idenitfy their
+      <p>Now add labels to the text fields, to identify their
       purposes for the user. For each text field, drag a Label object
       from the palette and drop it next to the field. (Alternatively,
@@ -197 +197 @@
       position the text field near the edge of the window, it also
       displays guide lines to help you position the labels near the
-      text fields. Just drag each text field until the blue guide
-      lines appear, and release the label.</p>
+      text fields. Just drag each label until the blue guide lines
+      appear, then release the label.</p>
 
       <p>Now change the text of the labels. Click a label to select
@@ -233 +233 @@
       
       <p>The first two text fields accept user input; the last
-      displays the result of the conversion. We want the first to text
-      fields to be editable, so users can enter the values to use in
-      the conversion. We don't want the last field to be editable, but
-      we do want users to be able to copy text from it.</p>
+      displays the result of the conversion. We want the first two
+      text fields to be editable, so users can enter the values to use
+      in the conversion. We don't want the last field to be editable,
+      but we do want users to be able to copy text from it.</p>
 
       <p>We can control all this behavior using text-field
@@ -329 +329 @@
             </div>
           </p>
-        <p><em>NOTE:</em> This change isn't really enough to get your
+        <p><strong>NOTE:</strong> This change isn't really enough to get your
         application to display the right name for the Application menu
         when it's launched; the <a href="build_app.html">section</a>
@@ -398 +398 @@
       <p>Users generally expect to be able to use the Tab key to move
       from one text field to the next in a dialog
-      box. InterfaceBuilder enables you to specify the tanning order
+      box. InterfaceBuilder enables you to specify the tabbing order
       in text fields.</p>
 
@@ -433 +433 @@
 
       <p>The visual elements of your application's user interface are
-      all ready now. The last thing you must do is create descruptions
+      all ready now. The last thing you must do is create descriptions
       of any custom classes used by the application when users
       interact with the interface.</p>
@@ -439 +439 @@
       <p>When a user clicks the "Convert" button, it should send a
       message to a custom class that causes the conversion to take
-      place, and the result to be displayed in the "Amount" field. In
-      order for the application to connect the user interface to
-      classes that perform these actions, you must add descriptions of
-      your classes to the nibfile. Fortunately, InterfaceBuilder can
-      create class descriptions and save them in the nibfile for
-      you.</p>
+      place. In order for the application to connect the user
+      interface to classes that perform these actions, you must add
+      descriptions of your classes to the nibfile. Fortunately,
+      InterfaceBuilder can create class descriptions and save them in
+      the nibfile for you.</p>
 
       <div class="section-head">
@@ -554 +553 @@
         view of the Inspector window, then click the "connect" button
         to confirm.</p></li>
-        <li><p>Connect the "ConverterController" instance to text
+        <li><p>Connect the "ConverterController" instance to the text
         fields. Control-drag from the "ConverterController" instance
         to the "Exchange Rate" field. Select "rateField" in the
         "Outlets" view of the Inspector window and click "connect" to
-        confirm. Then repeat this process, connecting "dollarField"
-        to the "Dollars" text field, and "amountField" to the
-        "Amount" field.</p></li>
+        confirm. Then repeat this process, connecting "dollarField" to
+        the "Dollars" text field, and "amountField" to the "Amount"
+        field.</p></li>
         <li><p>Finally, connect the "ConverterController" to the
         "Converter" instance. Control-drag from the
@@ -566 +565 @@
         instance. Select the "converter" outlet in the Inspector
         window and click "connect" to confirm.</p></li>
-        <li><p></p></li>
       </ol>
 

branches/gz-working/examples/cocoa/currency-converter/HOWTO_files/pages/conclusion.html

@@ -17 +17 @@
       CurrencyConverter example in Lisp with Clozure CL. Your own Lisp
       applications are likely to be considerably more complex than the
-      Currency Converter, which, after all, just does a simpe
+      Currency Converter, which, after all, just does a simple
       multiplication. You can, however, use exactly the same steps to
       build a much richer and more full-featured Cocoa
@@ -24 +24 @@
       <p>A more complex application will still consist of one or more
       nibfiles and one or more Lisp source files. You will still use
-      the Objective C bridge to define Objective C classes and
+      the Objective-C bridge to define Objective-C classes and
       methods, and to use Cocoa library features. And you will still
       use BUILD-APPLICATION to turn your source and nibfiles into
@@ -30 +30 @@
 
       <p>You should now be able to use Clozure CL to accomplish anything
-      that an Objective C user can accomplish with Cocoa. Good luck!</p>
+      that an Objective-C user can accomplish with Cocoa. Good luck!</p>
 
     <div class="nav">

branches/gz-working/examples/cocoa/currency-converter/HOWTO_files/pages/writing_lisp.html

@@ -15 +15 @@
     <div class="body-text">
       <p>In this section we'll write Lisp code that duplicates the
-      features provided by the Objective C code in Apple's
+      features provided by the Objective-C code in Apple's
       tutorial. In Apple's tutorial, the explanation of the Objective
       C code begins with the
@@ -22 +22 @@
 
       <p>The Lisp code in this section of the HOWTO is considerably
-      simpler than the corresponding Objective C code, in part
+      simpler than the corresponding Objective-C code, in part
       because we can ignore the conventions that XCode uses for
       laying out source files. We can just write all our definitions
@@ -37 +37 @@
       <pre>(in-package "CCL")</pre> 
 
-      <p>Clozure CL's Objective C bridge code is defined in the "CCL"
+      <p>Clozure CL's Objective-C bridge code is defined in the "CCL"
       package. Usually, when building an application, you'll create a
       package for that application and import the definitions you need
@@ -67 +67 @@
       <p>This is an ordinary CLOS class definition, with a couple of
       simple wrinkles. First, the superclass it inherits from is the
-      NS-OBJECT class in the "NS" package. NS-OBJECT is an Objective C
-      class, the ancestor of all Objective C objects. This CLOS
-      definition actually creates a new Objective C class named
+      NS-OBJECT class in the "NS" package. NS-OBJECT is an Objective-C
+      class, the ancestor of all Objective-C objects. This CLOS
+      definition actually creates a new Objective-C class named
       "Converter".</p>
 
@@ -79 +79 @@
       </pre>    
 
-      <p>The Objective C bridge knows that when the metaclass
+      <p>The Objective-C bridge knows that when the metaclass
       is <code>ns:+ns-object</code>, it must lay out the class object
-      in memory as an Objective C class, rather than a normal CLOS
+      in memory as an Objective-C class, rather than a normal CLOS
       STANDARD-CLASS.</p>
 
@@ -93 +93 @@
 
       <p>This is the method that actually does the currency
-      conversion. It's very simple&mdash;really, it just multiples
+      conversion. It's a Lisp method that will be called when the
+      AppKit sends the Objective-C message "convertCurrency:atRate:"
+      It's very simple&mdash;really, it just multiples
       <code>currency</code> times <code>rate</code>. Most of the text in the definition is
-      Objective C bridge code that links the definition to the right
+      Objective-C bridge code that links the definition to the right
       class with the right argument and return types.</p>
 
       <p><code>objc:defmethod</code> is a version of DEFMETHOD that
-      creates Objective C method definitions.</p>
+      creates methods that can execute in response to Objective-C
+      message-sends.</p>
 
       <p>The syntax <code>#/convertCurrency:atRate:</code> uses the
       "#/" reader macro to read a symbol with case preserved, so that
-      you can see in your code the same name that Objective C uses for
+      you can see in your code the same name that Objective-C uses for
       the method, without worrying about how the name might be
-      converted between Lisp and Objective C conventions.</p>
-
-      <p>The number of arguments to an Objective C method is the
+      converted between Lisp and Objective-C conventions.</p>
+
+      <p>The number of arguments to an Objective-C method is the
       number of colons in the name, plus one. Each colon indicates an
       argument, and there is always an extra "self" argument that
       refers to the object that receives the message. These are normal
-      Objective C conventions, but we perhaps need to emphasize the
-      details, since we are using Lisp code to call the Objective C
+      Objective-C conventions, but we perhaps need to emphasize the
+      details, since we are using Lisp code to call the Objective-C
       methods.</p>
 
@@ -163 +166 @@
       </pre>
       
-      <p>Once again we use the Objective C bridge to define an
-      Objective C class. This time, we provide several
+      <p>Once again we use the Objective-C bridge to define an
+      Objective-C class. This time, we provide several
       instance-variable definitions in the class, and name accessors
       for each of them explicitly. The <code>:FOREIGN-TYPE</code>
-      initargs enable us to specify the type of the field in the
-      foreign (Objective C) class.</p>
+      initargs enable us to specify the type of each field in the
+      foreign (Objective-C) class.</p>
 
       <p>Each field in the definition of the ConverterController class
       is an outlet that will be used to store a reference to one of
-      the UI fields that you created in InterfaceBuilder. For
+      the text fields that you created in InterfaceBuilder. For
       example, <code>amount-field</code> will be connected to the
-      "Amount" text field.</p> 
+      "Amount" text field.</p>
 
       <p>Why did we spell the name "amount-field" in Lisp code, and
       "amountField" when creating the outlet in InterfaceBuilder?  The
-      Objective C bridge automatically converts Lisp-style field names
-      (like "amount-field") to Objective C-style field names (like
+      Objective-C bridge automatically converts Lisp-style field names
+      (like "amount-field") to Objective-C-style field names (like
       "amountField"), when handling class definitions.</p>
 
@@ -209 +212 @@
       conversion. The only significant difference between this
       implementation and Apple's is that the code is written in Lisp
-      rather than Objective C.</p>
+      rather than Objective-C.</p>
 
       <p>This completes the definition of the CurrencyConverter's
-      behavior. All that remains is to actually build the cocoa
+      behavior. All that remains is to actually build the Cocoa
       application. The next section shows how to do that.</p>
 

branches/gz-working/lib/backtrace.lisp

@@ -443 +443 @@
                       name
                       (position name names :from-end t))))
-          (if (and pos (< pos nargs))
+          (if pos
             (map-entry-value context cfp lfun pc (nth pos indices) unavailable)
             unavailable))

branches/gz-working/lisp-kernel/x86-exceptions.c

@@ -1473 +1473 @@
 quit_handler(int signum, siginfo_t *info, ExceptionInformation *xp)
 {
+#ifdef DARWIN_GS_HACK
+  Boolean gs_was_tcr = ensure_gs_pthread();
+#endif
   TCR *tcr = get_tcr(false);
   area *a;