cleanup, reformatting

git-svn-id: svn+ssh://www.entropy.ch/Users/liyanage/Documents/svnroot/trunk/LeanCalc@132 153f8dbc-cef0-0310-8e0e-ba1d6c9f8c6b

diff --git a/LeanCalc.xcode/liyanage.mode1 b/LeanCalc.xcode/liyanage.mode1
index f626b2c..934baf0 100644 (file)
--- a/LeanCalc.xcode/liyanage.mode1
+++ b/LeanCalc.xcode/liyanage.mode1
@@ -224,6 +224,8 @@
                        <key>Layout</key>
                        <array>
                                <dict>
+                                       <key>BecomeActive</key>
+                                       <true/>
                                        <key>ContentConfiguration</key>
                                        <dict>
                                                <key>PBXBottomSmartGroupGIDs</key>
@@ -260,20 +262,20 @@
                                                        <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
                                                        <array>
                                                                <string>2A37F4AAFDCFA73011CA2CEA</string>
+                                                               <string>2A37F4ABFDCFA73011CA2CEA</string>
                                                                <string>2A37F4AFFDCFA73011CA2CEA</string>
                                                                <string>2A37F4B8FDCFA73011CA2CEA</string>
                                                                <string>2A37F4C3FDCFA73011CA2CEA</string>
                                                                <string>1058C7A6FEA54F5311CA2CBB</string>
                                                                <string>1C37FBAC04509CD000000102</string>
-                                                               <string>1B82477C07BF8A4C00279D6D</string>
                                                                <string>1C37FABC05509CD000000102</string>
                                                                <string>1CC0EA4004350EF90041110B</string>
                                                        </array>
                                                        <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
                                                        <array>
                                                                <array>
-                                                                       <integer>4</integer>
-                                                                       <integer>2</integer>
+                                                                       <integer>9</integer>
+                                                                       <integer>1</integer>
                                                                        <integer>0</integer>
                                                                </array>
                                                        </array>
@@ -309,7 +311,7 @@
                                                                <key>PBXProjectModuleGUID</key>
                                                                <string>1CE0B20306471E060097A5F4</string>
                                                                <key>PBXProjectModuleLabel</key>
-                                                               <string>LeanCalc_Prefix.pch</string>
+                                                               <string>MyDocument.m</string>
                                                                <key>PBXSplitModuleInNavigatorKey</key>
                                                                <dict>
                                                                        <key>Split0</key>
@@ -317,9 +319,9 @@
                                                                                <key>PBXProjectModuleGUID</key>
                                                                                <string>1CE0B20406471E060097A5F4</string>
                                                                                <key>PBXProjectModuleLabel</key>
-                                                                               <string>LeanCalc_Prefix.pch</string>
+                                                                               <string>MyDocument.m</string>
                                                                                <key>bookmark</key>
-                                                                               <string>1B82478C07BF8A7600279D6D</string>
+                                                                               <string>1B824B3207BF8C6C00279D6D</string>
                                                                                <key>history</key>
                                                                                <array>
                                                                                        <string>1BD2F3F207B74F230022B69D</string>
@@ -328,9 +330,16 @@
                                                                                        <string>1B82434A07BF7A4B00279D6D</string>
                                                                                        <string>1B8243C007BF863D00279D6D</string>
                                                                                        <string>1B8243C407BF865300279D6D</string>
-                                                                                       <string>1B8243E107BF86BE00279D6D</string>
                                                                                        <string>1B82478907BF8A7600279D6D</string>
-                                                                                       <string>1B82478A07BF8A7600279D6D</string>
+                                                                                       <string>1B824B1C07BF8C6200279D6D</string>
+                                                                                       <string>1B824B1D07BF8C6200279D6D</string>
+                                                                                       <string>1B824B1E07BF8C6200279D6D</string>
+                                                                                       <string>1B824B1F07BF8C6200279D6D</string>
+                                                                                       <string>1B824B2007BF8C6200279D6D</string>
+                                                                                       <string>1B824B2107BF8C6200279D6D</string>
+                                                                                       <string>1B824B2207BF8C6200279D6D</string>
+                                                                                       <string>1B824B2307BF8C6200279D6D</string>
+                                                                                       <string>1B824B2407BF8C6200279D6D</string>
                                                                                </array>
                                                                                <key>prevStack</key>
                                                                                <array>
@@ -342,6 +351,18 @@
                                                                                        <string>1B8243C607BF865300279D6D</string>
                                                                                        <string>1B8243E307BF86BE00279D6D</string>
                                                                                        <string>1B82478B07BF8A7600279D6D</string>
+                                                                                       <string>1B824B2507BF8C6200279D6D</string>
+                                                                                       <string>1B824B2607BF8C6200279D6D</string>
+                                                                                       <string>1B824B2707BF8C6200279D6D</string>
+                                                                                       <string>1B824B2807BF8C6200279D6D</string>
+                                                                                       <string>1B824B2907BF8C6200279D6D</string>
+                                                                                       <string>1B824B2A07BF8C6200279D6D</string>
+                                                                                       <string>1B824B2B07BF8C6200279D6D</string>
+                                                                                       <string>1B824B2C07BF8C6200279D6D</string>
+                                                                                       <string>1B824B2D07BF8C6200279D6D</string>
+                                                                                       <string>1B824B2E07BF8C6200279D6D</string>
+                                                                                       <string>1B824B2F07BF8C6200279D6D</string>
+                                                                                       <string>1B824B3007BF8C6200279D6D</string>
                                                                                </array>
                                                                        </dict>
                                                                        <key>SplitCount</key>
@@ -399,9 +420,9 @@
                        </array>
                        <key>TableOfContents</key>
                        <array>
-                               <string>1B82477F07BF8A4C00279D6D</string>
+                               <string>1B824B1607BF8B1100279D6D</string>
                                <string>1CE0B1FE06471DED0097A5F4</string>
-                               <string>1B82478007BF8A4C00279D6D</string>
+                               <string>1B824B1707BF8B1100279D6D</string>
                                <string>1CE0B20306471E060097A5F4</string>
                                <string>1CE0B20506471E060097A5F4</string>
                        </array>
@@ -414,7 +435,7 @@
        <key>StatusbarIsVisible</key>
        <true/>
        <key>TimeStamp</key>
-       <real>129993334.12741338</real>
+       <real>129993836.59627661</real>
        <key>ToolbarDisplayMode</key>
        <integer>1</integer>
        <key>ToolbarIsVisible</key>
@@ -429,7 +450,7 @@
        <integer>5</integer>
        <key>WindowOrderList</key>
        <array>
-               <string>1B82478107BF8A4C00279D6D</string>
+               <string>1B824B1807BF8B1100279D6D</string>
                <string>1C0AD2B3069F1EA900FABCE6</string>
                <string>/Users/liyanage/cvs/entropy/LeanCalc/LeanCalc.xcode</string>
        </array>
@@ -520,8 +541,8 @@
                        <true/>
                        <key>TableOfContents</key>
                        <array>
-                               <string>1B82478107BF8A4C00279D6D</string>
-                               <string>1B82478207BF8A4C00279D6D</string>
+                               <string>1B824B1807BF8B1100279D6D</string>
+                               <string>1B824B1907BF8B1100279D6D</string>
                                <string>1CD0528F0623707200166675</string>
                                <string>XCMainBuildResultsModuleGUID</string>
                        </array>
@@ -530,7 +551,7 @@
                        <key>WindowString</key>
                        <string>661 163 589 501 0 0 1440 878 </string>
                        <key>WindowToolGUID</key>
-                       <string>1B82478107BF8A4C00279D6D</string>
+                       <string>1B824B1807BF8B1100279D6D</string>
                        <key>WindowToolIsVisible</key>
                        <true/>
                </dict>
@@ -830,8 +851,8 @@
                                                                                <string>yes</string>
                                                                                <key>sizes</key>
                                                                                <array>
-                                                                                       <string>{{0, 0}, {493, 167}}</string>
-                                                                                       <string>{{0, 176}, {493, 267}}</string>
+                                                                                       <string>{{0, 0}, {366, 167}}</string>
+                                                                                       <string>{{0, 176}, {366, 267}}</string>
                                                                                </array>
                                                                        </dict>
                                                                        <key>VerticalSplitView</key>
@@ -880,9 +901,9 @@
                        <key>TableOfContents</key>
                        <array>
                                <string>1C0AD2B3069F1EA900FABCE6</string>
-                               <string>1B82478307BF8A4C00279D6D</string>
+                               <string>1B824B1A07BF8B1100279D6D</string>
                                <string>1CD0528B0623707200166675</string>
-                               <string>1B82478407BF8A4C00279D6D</string>
+                               <string>1B824B1B07BF8B1100279D6D</string>
                        </array>
                        <key>ToolbarConfiguration</key>
                        <string>xcode.toolbar.config.run</string>

diff --git a/LeanCalc.xcode/liyanage.pbxuser b/LeanCalc.xcode/liyanage.pbxuser
index b916e49..129d2bb 100644 (file)
--- a/LeanCalc.xcode/liyanage.pbxuser
+++ b/LeanCalc.xcode/liyanage.pbxuser
@@ -115,6 +115,55 @@
                        sepNavVisRect = "{{0, 0}, {650, 465}}";
                };
        };
+       1B8243CE07BF867300279D6D = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {881, 1022}}";
+                       sepNavSelRange = "{1032, 0}";
+                       sepNavVisRect = "{{0, 0}, {650, 465}}";
+               };
+       };
+       1B8243CF07BF867300279D6D = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {650, 465}}";
+                       sepNavSelRange = "{0, 0}";
+                       sepNavVisRect = "{{0, 0}, {650, 465}}";
+               };
+       };
+       1B8243D007BF867300279D6D = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {1063, 1750}}";
+                       sepNavSelRange = "{1936, 0}";
+                       sepNavVisRect = "{{0, 1285}, {650, 465}}";
+               };
+       };
+       1B8243D107BF867300279D6D = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {650, 465}}";
+                       sepNavSelRange = "{239, 0}";
+                       sepNavVisRect = "{{0, 0}, {650, 465}}";
+               };
+       };
+       1B8243D207BF867300279D6D = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {664, 546}}";
+                       sepNavSelRange = "{685, 0}";
+                       sepNavVisRect = "{{0, 81}, {650, 465}}";
+               };
+       };
+       1B8243D307BF867300279D6D = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {650, 465}}";
+                       sepNavSelRange = "{374, 0}";
+                       sepNavVisRect = "{{0, 0}, {650, 465}}";
+               };
+       };
+       1B8243D407BF867300279D6D = {
+               uiCtxt = {
+                       sepNavIntBoundsRect = "{{0, 0}, {1252, 1764}}";
+                       sepNavSelRange = "{258, 0}";
+                       sepNavVisRect = "{{0, 587}, {650, 465}}";
+               };
+       };
        1B8243E107BF86BE00279D6D = {
                fRef = 1B8243CD07BF867300279D6D;
                isa = PBXTextBookmark;
@@ -182,6 +231,256 @@
                vrLen = 147;
                vrLoc = 0;
        };
+       1B824B1407BF8B1100279D6D = {
+               fRef = 1B82478707BF8A7000279D6D;
+               isa = PBXTextBookmark;
+               name = "LeanCalc_Prefix.pch: 6";
+               rLen = 0;
+               rLoc = 132;
+               rType = 0;
+               vrLen = 147;
+               vrLoc = 0;
+       };
+       1B824B1507BF8B1100279D6D = {
+               fRef = 1B82478707BF8A7000279D6D;
+               isa = PBXTextBookmark;
+               name = "LeanCalc_Prefix.pch: 6";
+               rLen = 0;
+               rLoc = 132;
+               rType = 0;
+               vrLen = 147;
+               vrLoc = 0;
+       };
+       1B824B1C07BF8C6200279D6D = {
+               fRef = 1B82478707BF8A7000279D6D;
+               isa = PBXTextBookmark;
+               name = "LeanCalc_Prefix.pch: 6";
+               rLen = 0;
+               rLoc = 132;
+               rType = 0;
+               vrLen = 147;
+               vrLoc = 0;
+       };
+       1B824B1D07BF8C6200279D6D = {
+               fRef = 1B8243CD07BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "AppDelegate.h: 13";
+               rLen = 0;
+               rLoc = 204;
+               rType = 0;
+               vrLen = 347;
+               vrLoc = 0;
+       };
+       1B824B1E07BF8C6200279D6D = {
+               fRef = 1B8243CE07BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "AppDelegate.m: 40";
+               rLen = 0;
+               rLoc = 1032;
+               rType = 0;
+               vrLen = 712;
+               vrLoc = 0;
+       };
+       1B824B1F07BF8C6200279D6D = {
+               fRef = 1B8243CF07BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "Calculation.h: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 418;
+               vrLoc = 0;
+       };
+       1B824B2007BF8C6200279D6D = {
+               fRef = 1B8243D007BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "Calculation.m: expressionIsEmpty";
+               rLen = 0;
+               rLoc = 1936;
+               rType = 0;
+               vrLen = 505;
+               vrLoc = 1803;
+       };
+       1B824B2107BF8C6200279D6D = {
+               fRef = 1B8243D107BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "CmdKeyInterceptApplication.h: 13";
+               rLen = 0;
+               rLoc = 239;
+               rType = 0;
+               vrLen = 247;
+               vrLoc = 0;
+       };
+       1B824B2207BF8C6200279D6D = {
+               fRef = 1B8243D207BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "CmdKeyInterceptApplication.m: 33";
+               rLen = 0;
+               rLoc = 685;
+               rType = 0;
+               vrLen = 691;
+               vrLoc = 94;
+       };
+       1B824B2307BF8C6200279D6D = {
+               fRef = 1B8243D307BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "MyDocument.h: commit:";
+               rLen = 0;
+               rLoc = 374;
+               rType = 0;
+               vrLen = 491;
+               vrLoc = 0;
+       };
+       1B824B2407BF8C6200279D6D = {
+               fRef = 1B8243D407BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "MyDocument.m: 23";
+               rLen = 0;
+               rLoc = 258;
+               rType = 0;
+               vrLen = 728;
+               vrLoc = 571;
+       };
+       1B824B2507BF8C6200279D6D = {
+               fRef = 1B82478707BF8A7000279D6D;
+               isa = PBXTextBookmark;
+               name = "LeanCalc_Prefix.pch: 6";
+               rLen = 0;
+               rLoc = 132;
+               rType = 0;
+               vrLen = 147;
+               vrLoc = 0;
+       };
+       1B824B2607BF8C6200279D6D = {
+               fRef = 1B8243CD07BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "AppDelegate.h: 13";
+               rLen = 0;
+               rLoc = 204;
+               rType = 0;
+               vrLen = 347;
+               vrLoc = 0;
+       };
+       1B824B2707BF8C6200279D6D = {
+               fRef = 1B8243CE07BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "AppDelegate.m: 40";
+               rLen = 0;
+               rLoc = 1032;
+               rType = 0;
+               vrLen = 712;
+               vrLoc = 0;
+       };
+       1B824B2807BF8C6200279D6D = {
+               fRef = 1B8243CF07BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "Calculation.h: 1";
+               rLen = 0;
+               rLoc = 0;
+               rType = 0;
+               vrLen = 418;
+               vrLoc = 0;
+       };
+       1B824B2907BF8C6200279D6D = {
+               fRef = 1B8243D007BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "Calculation.m: expressionIsEmpty";
+               rLen = 0;
+               rLoc = 1936;
+               rType = 0;
+               vrLen = 505;
+               vrLoc = 1803;
+       };
+       1B824B2A07BF8C6200279D6D = {
+               fRef = 1B8243D107BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "CmdKeyInterceptApplication.h: 13";
+               rLen = 0;
+               rLoc = 239;
+               rType = 0;
+               vrLen = 247;
+               vrLoc = 0;
+       };
+       1B824B2B07BF8C6200279D6D = {
+               fRef = 1B8243D207BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "CmdKeyInterceptApplication.m: 33";
+               rLen = 0;
+               rLoc = 685;
+               rType = 0;
+               vrLen = 691;
+               vrLoc = 94;
+       };
+       1B824B2C07BF8C6200279D6D = {
+               fRef = 1B8243D307BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "MyDocument.h: commit:";
+               rLen = 0;
+               rLoc = 374;
+               rType = 0;
+               vrLen = 491;
+               vrLoc = 0;
+       };
+       1B824B2D07BF8C6200279D6D = {
+               fRef = 1B8243D407BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "MyDocument.m: 23";
+               rLen = 0;
+               rLoc = 258;
+               rType = 0;
+               vrLen = 422;
+               vrLoc = 0;
+       };
+       1B824B2E07BF8C6200279D6D = {
+               fRef = 1B8243D307BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "MyDocument.h: commit:";
+               rLen = 0;
+               rLoc = 374;
+               rType = 0;
+               vrLen = 491;
+               vrLoc = 0;
+       };
+       1B824B2F07BF8C6200279D6D = {
+               fRef = 1B8243D407BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "MyDocument.m: 23";
+               rLen = 0;
+               rLoc = 258;
+               rType = 0;
+               vrLen = 728;
+               vrLoc = 571;
+       };
+       1B824B3007BF8C6200279D6D = {
+               fRef = 1B8243D307BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "MyDocument.h: commit:";
+               rLen = 0;
+               rLoc = 374;
+               rType = 0;
+               vrLen = 491;
+               vrLoc = 0;
+       };
+       1B824B3107BF8C6200279D6D = {
+               fRef = 1B8243D407BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "MyDocument.m: 23";
+               rLen = 0;
+               rLoc = 258;
+               rType = 0;
+               vrLen = 730;
+               vrLoc = 569;
+       };
+       1B824B3207BF8C6C00279D6D = {
+               fRef = 1B8243D407BF867300279D6D;
+               isa = PBXTextBookmark;
+               name = "MyDocument.m: 23";
+               rLen = 0;
+               rLoc = 258;
+               rType = 0;
+               vrLen = 730;
+               vrLoc = 569;
+       };
        1BADE91E07BC0E6C0020BE61 = {
                fRef = 2A37F4B7FDCFA73011CA2CEA;
                isa = PBXBookmark;
@@ -272,7 +571,7 @@
                                        PBXFileDataSource_Warnings_ColumnID,
                                );
                        };
-                       PBXPerProjectTemplateStateSaveDate = 129993072;
+                       PBXPerProjectTemplateStateSaveDate = 129993428;
                        PBXPrepackagedSmartGroups_v2 = (
                                {
                                        PBXTransientLocationAtTop = bottom;
@@ -449,7 +748,7 @@
                                        };
                                },
                        );
-                       PBXWorkspaceStateSaveDate = 129993072;
+                       PBXWorkspaceStateSaveDate = 129993428;
                };
                perUserProjectItems = {
                        1B82418207BE13B000279D6D = 1B82418207BE13B000279D6D;
@@ -465,6 +764,31 @@
                        1B82478A07BF8A7600279D6D = 1B82478A07BF8A7600279D6D;
                        1B82478B07BF8A7600279D6D = 1B82478B07BF8A7600279D6D;
                        1B82478C07BF8A7600279D6D = 1B82478C07BF8A7600279D6D;
+                       1B824B1407BF8B1100279D6D = 1B824B1407BF8B1100279D6D;
+                       1B824B1507BF8B1100279D6D = 1B824B1507BF8B1100279D6D;
+                       1B824B1C07BF8C6200279D6D = 1B824B1C07BF8C6200279D6D;
+                       1B824B1D07BF8C6200279D6D = 1B824B1D07BF8C6200279D6D;
+                       1B824B1E07BF8C6200279D6D = 1B824B1E07BF8C6200279D6D;
+                       1B824B1F07BF8C6200279D6D = 1B824B1F07BF8C6200279D6D;
+                       1B824B2007BF8C6200279D6D = 1B824B2007BF8C6200279D6D;
+                       1B824B2107BF8C6200279D6D = 1B824B2107BF8C6200279D6D;
+                       1B824B2207BF8C6200279D6D = 1B824B2207BF8C6200279D6D;
+                       1B824B2307BF8C6200279D6D = 1B824B2307BF8C6200279D6D;
+                       1B824B2407BF8C6200279D6D = 1B824B2407BF8C6200279D6D;
+                       1B824B2507BF8C6200279D6D = 1B824B2507BF8C6200279D6D;
+                       1B824B2607BF8C6200279D6D = 1B824B2607BF8C6200279D6D;
+                       1B824B2707BF8C6200279D6D = 1B824B2707BF8C6200279D6D;
+                       1B824B2807BF8C6200279D6D = 1B824B2807BF8C6200279D6D;
+                       1B824B2907BF8C6200279D6D = 1B824B2907BF8C6200279D6D;
+                       1B824B2A07BF8C6200279D6D = 1B824B2A07BF8C6200279D6D;
+                       1B824B2B07BF8C6200279D6D = 1B824B2B07BF8C6200279D6D;
+                       1B824B2C07BF8C6200279D6D = 1B824B2C07BF8C6200279D6D;
+                       1B824B2D07BF8C6200279D6D = 1B824B2D07BF8C6200279D6D;
+                       1B824B2E07BF8C6200279D6D = 1B824B2E07BF8C6200279D6D;
+                       1B824B2F07BF8C6200279D6D = 1B824B2F07BF8C6200279D6D;
+                       1B824B3007BF8C6200279D6D = 1B824B3007BF8C6200279D6D;
+                       1B824B3107BF8C6200279D6D = 1B824B3107BF8C6200279D6D;
+                       1B824B3207BF8C6C00279D6D = 1B824B3207BF8C6C00279D6D;
                        1BADE91E07BC0E6C0020BE61 = 1BADE91E07BC0E6C0020BE61;
                        1BC8F14907B8301200987A06 = 1BC8F14907B8301200987A06;
                        1BD2F3F207B74F230022B69D = 1BD2F3F207B74F230022B69D;

diff --git a/Sources/AppDelegate.m b/Sources/AppDelegate.m
index 58b6163..a48fcb7 100644 (file)
--- a/Sources/AppDelegate.m
+++ b/Sources/AppDelegate.m
@@ -24,8 +24,6 @@
 
 - (void)initFunctionReference {
 
-
-       NSLog(@"start");
        functionReference = [[NSMutableArray alloc] init];
 
        NSString *helpBasedir = [NSString stringWithFormat:@"%@/help", [[NSBundle mainBundle] resourcePath]];
@@ -39,7 +37,6 @@
                NSDictionary *newEntry = [NSDictionary dictionaryWithObjectsAndKeys:filename, @"name", fileContents, @"text", nil];
                [functionReference addObject:newEntry];
        }
-       NSLog(@"stop");
        
 }
 

diff --git a/Sources/Calculation.m b/Sources/Calculation.m
index 51c8913..9f9af92 100644 (file)
--- a/Sources/Calculation.m
+++ b/Sources/Calculation.m
@@ -59,12 +59,6 @@
 }
 
 
-
-
-
-
-
-
 extern jmp_buf calc_jmp_buf;
 extern jmp_buf jmpbuf;
 extern int calc_jmp;
@@ -107,13 +101,9 @@ extern char *calc_error;
 
 
 
-- (void)encodeWithCoder:(NSCoder *)coder
-{
-
-//    [super encodeWithCoder:coder];
+- (void)encodeWithCoder:(NSCoder *)coder {
        [coder encodeObject:expression forKey:@"expression"];
        [coder encodeObject:next forKey:@"next"];
-
 }
 
 

diff --git a/Sources/CmdKeyInterceptApplication.h b/Sources/CmdKeyInterceptApplication.h
index 187344f..1b1baf9 100644 (file)
--- a/Sources/CmdKeyInterceptApplication.h
+++ b/Sources/CmdKeyInterceptApplication.h
@@ -10,9 +10,6 @@
 
 
 @interface CmdKeyInterceptApplication : NSApplication {
-
-       
-       
 }
 
 @end

diff --git a/Sources/MyDocument.h b/Sources/MyDocument.h
index f842c24..78632e8 100644 (file)
--- a/Sources/MyDocument.h
+++ b/Sources/MyDocument.h
@@ -13,23 +13,15 @@
 
 @interface MyDocument : NSDocument
 {
-//     NSString *inputString, *resultValue;
        NSTextField *expressionField;
        NSMutableArray *calculations;
        NSArrayController *arrayController;
        NSWindow *window;
 }
 
-
-
 - (IBAction)commit:(id)sender;
 - (void)addItem;
 - (BOOL)lastItemIsSelected;
 - (void)insertPrevious:(id)sender;
-//- (void)insertPrevious;
 
-/*
-- (BOOL)setupHistoryMenu:(NSMenu *)submenu;
-- (void)updateHistoryMenu;
-*/
 @end

diff --git a/Sources/MyDocument.m b/Sources/MyDocument.m
index 51823fe..6791d37 100644 (file)
--- a/Sources/MyDocument.m
+++ b/Sources/MyDocument.m
@@ -11,7 +11,6 @@
 
 - num lock / esc clear expression
 
-
 */
 
 
@@ -21,23 +20,18 @@
 @implementation MyDocument
 
 - (id)init {
-
     self = [super init];
     if (!self) return nil;
-
        calculations = [[NSMutableArray alloc] init];
-       
-    return self;
+       return self;
 }
 
 
-
 - (void)dealloc {
        [calculations release];
 }
 
 
-
 - (void)awakeFromNib {
 
        if (![self fileName]) {
@@ -45,7 +39,6 @@
        }
        
        [arrayController setSelectionIndex:[calculations count] - 1];
-
 }
 
 
@@ -68,7 +61,6 @@
        id selectedObject = [[arrayController selectedObjects] objectAtIndex:0];
 
        return selectedObject == lastObject;
-       
 }
 
 
@@ -93,36 +85,27 @@
 }
 
 
-
-
-
 - (NSArray *)control:(NSControl *)control textView:(NSTextView *)textView completions:(NSArray *)words forPartialWordRange:(NSRange)charRange indexOfSelectedItem:(int *)index {
 
        NSString *partialWord = [[textView string] substringWithRange:charRange];
        NSArray *completions = [[[NSApplication sharedApplication] delegate] completionsForPartialWord:partialWord];
 
        return completions;
-       
 }
 
 
 
-- (NSString *)windowNibName
-{
-    // Override returning the nib file name of the document
-    // If you need to use a subclass of NSWindowController or if your document supports multiple NSWindowControllers, you should remove this method and override -makeWindowControllers instead.
+- (NSString *)windowNibName {
     return @"MyDocument";
 }
 
-- (void)windowControllerDidLoadNib:(NSWindowController *) aController
-{
-    [super windowControllerDidLoadNib:aController];
-    // Add any code here that needs to be executed once the windowController has loaded the document's window.
 
+- (void)windowControllerDidLoadNib:(NSWindowController *) aController {
+    [super windowControllerDidLoadNib:aController];
 }
 
-- (NSData *)dataRepresentationOfType:(NSString *)aType {
 
+- (NSData *)dataRepresentationOfType:(NSString *)aType {
        NSMutableData *data = [[[NSMutableData alloc] init] autorelease];
        NSKeyedArchiver *archiver = [[[NSKeyedArchiver alloc] initForWritingWithMutableData:data] autorelease];
        [archiver setOutputFormat:NSPropertyListXMLFormat_v1_0];
@@ -133,11 +116,9 @@
 
 
 - (BOOL)loadDataRepresentation:(NSData *)data ofType:(NSString *)aType {
-
        NSKeyedUnarchiver *unarchiver = [[[NSKeyedUnarchiver alloc] initForReadingWithData:data] autorelease];
        [self setValue:[unarchiver decodeObjectForKey:@"calculations"] forKey:@"calculations"];
        [unarchiver finishDecoding];
-
     return YES;
 }
 

diff --git a/calc/libcalc.a b/calc/libcalc.a
index c7b494e..30144f6 100644 (file)
Binary files a/calc/libcalc.a and b/calc/libcalc.a differ

diff --git a/calc/libcustcalc.a b/calc/libcustcalc.a
index a19ef55..e8eb158 100644 (file)
Binary files a/calc/libcustcalc.a and b/calc/libcustcalc.a differ