Renaming registers to variables

diff --git a/English.lproj/Debugger.xib b/English.lproj/Debugger.xib
index a58c123529b84a47f459e465eebee632b756a7d4..c3e5608a2402da742b6d9c047d5217ee44c8f4a4 100644 (file)
--- a/English.lproj/Debugger.xib
+++ b/English.lproj/Debugger.xib
@@ -8,7 +8,6 @@
                <string key="IBDocument.HIToolboxVersion">352.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="7"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -394,7 +393,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
                                <string key="NSWindowContentMinSize">{213, 107}</string>
                                <object class="NSView" key="NSWindowView" id="976098315">
-                                       <reference key="NSNextResponder"/>
+                                       <nil key="NSNextResponder"/>
                                        <int key="NSvFlags">256</int>
                                        <object class="NSMutableArray" key="NSSubviews">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -910,7 +909,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                </object>
                                        </object>
                                        <string key="NSFrameSize">{769, 501}</string>
-                                       <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
                                <string key="NSMinSize">{213, 169}</string>
@@ -1068,22 +1066,6 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                        </object>
                                        <int key="connectionID">92</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">registerController</string>
-                                               <reference key="source" ref="78922448"/>
-                                               <reference key="destination" ref="240336030"/>
-                                       </object>
-                                       <int key="connectionID">144</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">registerView</string>
-                                               <reference key="source" ref="78922448"/>
-                                               <reference key="destination" ref="395283679"/>
-                                       </object>
-                                       <int key="connectionID">169</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">errormsg</string>
@@ -1264,6 +1246,22 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                        </object>
                                        <int key="connectionID">565</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">variablesTreeController</string>
+                                               <reference key="source" ref="78922448"/>
+                                               <reference key="destination" ref="240336030"/>
+                                       </object>
+                                       <int key="connectionID">566</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">variablesOutlineView</string>
+                                               <reference key="source" ref="78922448"/>
+                                               <reference key="destination" ref="395283679"/>
+                                       </object>
+                                       <int key="connectionID">567</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -1344,7 +1342,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                <int key="objectID">59</int>
                                                <reference key="object" ref="240336030"/>
                                                <reference key="parent" ref="931987460"/>
-                                               <string key="objectName">RegistersController</string>
+                                               <string key="objectName">VariablesController</string>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">453</int>
@@ -1803,7 +1801,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">565</int>
+                       <int key="maxID">567</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1863,20 +1861,20 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
                                                <object class="NSMutableArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>errormsg</string>
-                                                       <string>registerController</string>
-                                                       <string>registerView</string>
                                                        <string>sourceViewer</string>
                                                        <string>stackArrayController</string>
                                                        <string>statusmsg</string>
+                                                       <string>variablesOutlineView</string>
+                                                       <string>variablesTreeController</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>NSTextField</string>
-                                                       <string>NSTreeController</string>
-                                                       <string>NSOutlineView</string>
                                                        <string>BSSourceView</string>
                                                        <string>NSArrayController</string>
                                                        <string>NSTextField</string>
+                                                       <string>NSOutlineView</string>
+                                                       <string>NSTreeController</string>
                                                </object>
                                        </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index ee2c3cd462ec5d3c7f800ffae2a9679141190792..7b2973d8eee59758d13e963bceae7daab6df3d60 100644 (file)
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -1981,8 +1981,6 @@
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>errormsg</string>
                                                        <string>reconnectButton</string>
-                                                       <string>registerController</string>
-                                                       <string>registerView</string>
                                                        <string>runButton</string>
                                                        <string>sourceViewer</string>
                                                        <string>stackController2</string>
@@ -1990,13 +1988,13 @@
                                                        <string>stepInButton</string>
                                                        <string>stepOutButton</string>
                                                        <string>stepOverButton</string>
+                                                       <string>variablesOutlineView</string>
+                                                       <string>variablesTreeController</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>NSTextField</string>
                                                        <string>NSToolbarItem</string>
-                                                       <string>NSTreeController</string>
-                                                       <string>NSOutlineView</string>
                                                        <string>NSToolbarItem</string>
                                                        <string>BSSourceView</string>
                                                        <string>NSArrayController</string>
@@ -2004,6 +2002,8 @@
                                                        <string>NSToolbarItem</string>
                                                        <string>NSToolbarItem</string>
                                                        <string>NSToolbarItem</string>
+                                                       <string>NSOutlineView</string>
+                                                       <string>NSTreeController</string>
                                                </object>
                                        </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">

diff --git a/Source/DebuggerController.h b/Source/DebuggerController.h
index 0bbbf5d94a0b5675969982273c5f454d27d4b7dd..c3e6267d1335a6fcb3edee76cbe7b916f068d16a 100644 (file)
--- a/Source/DebuggerController.h
+++ b/Source/DebuggerController.h
@@ -27,9 +27,9 @@
        StackController *stackController;
        IBOutlet NSArrayController *stackArrayController;
        
-       IBOutlet NSTreeController *registerController;
-       IBOutlet NSOutlineView *registerView;
-       NSMutableSet *expandedRegisters;
+       IBOutlet NSTreeController *variablesTreeController;
+       IBOutlet NSOutlineView *variablesOutlineView;
+       NSMutableSet *expandedVariables;
        
        IBOutlet NSTextField *statusmsg;
        IBOutlet NSTextField *errormsg;

diff --git a/Source/DebuggerController.m b/Source/DebuggerController.m
index c201ffdcf3539f6abadd957f1db44eec0a10f94c..e4972a7e2b6d17058c4461d580004fb8ade45ba5 100644 (file)
--- a/Source/DebuggerController.m
+++ b/Source/DebuggerController.m
@@ -42,7 +42,7 @@
                
                NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
                connection = [[GDBpConnection alloc] initWithPort:[defaults integerForKey:@"Port"] session:[defaults stringForKey:@"IDEKey"]];
-               expandedRegisters = [[NSMutableSet alloc] init];
+               expandedVariables = [[NSMutableSet alloc] init];
                [[self window] makeKeyAndOrderFront:nil];
                [[self window] setDelegate:self];
                
@@ -62,7 +62,7 @@
 - (void)dealloc
 {
        [connection release];
-       [expandedRegisters release];
+       [expandedVariables release];
        [stackController release];
        [super dealloc];
 }
@@ -108,7 +108,7 @@
  */
 - (void)resetDisplays
 {
-       [registerController setContent:nil];
+       [variablesTreeController setContent:nil];
        [stackController.stack removeAllObjects];
        [[sourceViewer textView] setString:@""];
 }
@@ -198,7 +198,7 @@
 - (void)outlineViewItemDidExpand:(NSNotification *)notif
 {
        NSTreeNode *node = [[notif userInfo] objectForKey:@"NSObject"];
-       [expandedRegisters addObject:[[node representedObject] fullname]];
+       [expandedVariables addObject:[[node representedObject] fullname]];
 }
 
 /**
@@ -206,7 +206,7 @@
  */
 - (void)outlineViewItemDidCollapse:(NSNotification *)notif
 {
-       [expandedRegisters removeObject:[[[[notif userInfo] objectForKey:@"NSObject"] representedObject] fullname]];
+       [expandedVariables removeObject:[[[[notif userInfo] objectForKey:@"NSObject"] representedObject] fullname]];
 }
 
 #pragma mark Private
@@ -258,12 +258,12 @@
  */
 - (void)expandVariables
 {
-       for (int i = 0; i < [registerView numberOfRows]; i++)
+       for (int i = 0; i < [variablesOutlineView numberOfRows]; i++)
        {
-               NSTreeNode *node = [registerView itemAtRow:i];
-               if ([expandedRegisters containsObject:[[node representedObject] fullname]])
+               NSTreeNode *node = [variablesOutlineView itemAtRow:i];
+               if ([expandedVariables containsObject:[[node representedObject] fullname]])
                {
-                       [registerView expandItem:node];
+                       [variablesOutlineView expandItem:node];
                }
        }
 }