Changeset 46

Timestamp:

10/03/05 16:57:54 (3 years ago)

Author:

gnue

Message:

NewtStrNBeginsWith change caseless for IsInstance, IsSubclass, HasSubclass bug fix

Location:

NEWT0/trunk

Files:

• newt.xcode/gnue.mode1 (modified) (19 diffs)
• newt.xcode/gnue.pbxuser (modified) (10 diffs)
• src/newt_core/NewtObj.c (modified) (1 diff)
• src/version.h (modified) (1 diff)

NEWT0/trunk/newt.xcode/gnue.mode1

@@ -191 +191 @@
             <dict>
                 <key>PBXProjectModuleGUID</key>
-                <string>F5614BBB08F0EFC400BD51D8</string>
+                <string>F53002A308F11B2700BE3F3C</string>
                 <key>PBXProjectModuleLabel</key>
                 <string>NewtObj.c</string>
@@ -199 +199 @@
                     <dict>
                         <key>PBXProjectModuleGUID</key>
-                        <string>F5614BBC08F0EFC400BD51D8</string>
+                        <string>F53002A408F11B2700BE3F3C</string>
                         <key>PBXProjectModuleLabel</key>
                         <string>NewtObj.c</string>
@@ -205 +205 @@
                         <integer>0</integer>
                         <key>bookmark</key>
-                        <string>F5614BBD08F0EFC400BD51D8</string>
+                        <string>F53002A508F11B2700BE3F3C</string>
                         <key>history</key>
                         <array>
-                            <string>F5614BA408F0EF2500BD51D8</string>
+                            <string>F530028908F11AC800BE3F3C</string>
                         </array>
                     </dict>
@@ -311 +311 @@
                             <array>
                                 <array>
-                                    <integer>43</integer>
-                                    <integer>5</integer>
+                                    <integer>51</integer>
                                     <integer>1</integer>
                                     <integer>0</integer>
@@ -348 +347 @@
                     <array>
                         <dict>
+                            <key>BecomeActive</key>
+                            <true/>
                             <key>ContentConfiguration</key>
                             <dict>
@@ -353 +354 @@
                                 <string>1CE0B20306471E060097A5F4</string>
                                 <key>PBXProjectModuleLabel</key>
-                                <string>NewtVM.c</string>
+                                <string>version.h</string>
                                 <key>PBXSplitModuleInNavigatorKey</key>
                                 <dict>
@@ -361 +362 @@
                                         <string>1CE0B20406471E060097A5F4</string>
                                         <key>PBXProjectModuleLabel</key>
-                                        <string>NewtVM.c</string>
+                                        <string>version.h</string>
                                         <key>_historyCapacity</key>
                                         <integer>0</integer>
                                         <key>bookmark</key>
-                                        <string>F5614BBA08F0EFC400BD51D8</string>
+                                        <string>F53002A008F11B2700BE3F3C</string>
                                         <key>history</key>
                                         <array>
@@ -389 +390 @@
                                             <string>F50AE99908AC13DD00774ABB</string>
                                             <string>F574E95108BF6AA600C73DAE</string>
-                                            <string>F5614BB808F0EFC400BD51D8</string>
-                                            <string>F532AA3D08AADBB500EE12BF</string>
+                                            <string>F530029D08F11B2700BE3F3C</string>
+                                            <string>F530029E08F11B2700BE3F3C</string>
                                         </array>
                                         <key>prevStack</key>
@@ -415 +416 @@
                                             <string>F528D7D508ABFE000001CB53</string>
                                             <string>F574E95308BF6AA600C73DAE</string>
-                                            <string>F5614BB908F0EFC400BD51D8</string>
+                                            <string>F530029F08F11B2700BE3F3C</string>
                                         </array>
                                     </dict>
@@ -437 +438 @@
                         </dict>
                         <dict>
-                            <key>BecomeActive</key>
-                            <true/>
                             <key>ContentConfiguration</key>
                             <dict>
@@ -475 +474 @@
             <key>TableOfContents</key>
             <array>
-                <string>F5614B8D08F0EED300BD51D8</string>
+                <string>F53002A108F11B2700BE3F3C</string>
                 <string>1CE0B1FE06471DED0097A5F4</string>
-                <string>F5614B8E08F0EED300BD51D8</string>
+                <string>F53002A208F11B2700BE3F3C</string>
                 <string>1CE0B20306471E060097A5F4</string>
                 <string>1CE0B20506471E060097A5F4</string>
@@ -611 +610 @@
     <key>WindowOrderList</key>
     <array>
+        <string>F5AE5683082409020043A79D</string>
         <string>1C0AD2B3069F1EA900FABCE6</string>
         <string>1C530D57069F1CE1000CFCEE</string>
-        <string>F5614BBB08F0EFC400BD51D8</string>
+        <string>F53002A308F11B2700BE3F3C</string>
         <string>/Volumes/Pawn/User/Development/Newt/NEWT0/newt.xcode</string>
     </array>
@@ -638 +638 @@
                                 <string>1CD0528F0623707200166675</string>
                                 <key>PBXProjectModuleLabel</key>
-                                <string>NewtIO.c</string>
+                                <string></string>
                                 <key>StatusBarVisibility</key>
                                 <true/>
@@ -696 +696 @@
             <array>
                 <string>F5AE5683082409020043A79D</string>
-                <string>F528D7D008ABFDFC0001CB53</string>
+                <string>F530029108F11B1500BE3F3C</string>
                 <string>1CD0528F0623707200166675</string>
                 <string>XCMainBuildResultsModuleGUID</string>
@@ -841 +841 @@
                                         <string>{{0, 0}, {788, 401}}</string>
                                         <key>RubberWindowFrame</key>
-                                        <string>50 87 788 659 0 0 1024 746 </string>
+                                        <string>283 87 788 659 0 0 1024 746 </string>
                                     </dict>
                                     <key>Module</key>
@@ -867 +867 @@
                                 <string>{{0, 406}, {788, 212}}</string>
                                 <key>RubberWindowFrame</key>
-                                <string>50 87 788 659 0 0 1024 746 </string>
+                                <string>283 87 788 659 0 0 1024 746 </string>
                             </dict>
                             <key>Module</key>
@@ -890 +890 @@
             <array>
                 <string>1C530D57069F1CE1000CFCEE</string>
-                <string>F5614B8508F0EEC000BD51D8</string>
-                <string>F5614B8608F0EEC000BD51D8</string>
+                <string>F530029408F11B1500BE3F3C</string>
+                <string>F530029508F11B1500BE3F3C</string>
                 <string>1CDD528C0622207200134675</string>
                 <string>1CD0528E0623707200166675</string>
             </array>
             <key>WindowString</key>
-            <string>50 87 788 659 0 0 1024 746 </string>
+            <string>283 87 788 659 0 0 1024 746 </string>
             <key>WindowToolGUID</key>
             <string>1C530D57069F1CE1000CFCEE</string>
             <key>WindowToolIsVisible</key>
-            <false/>
+            <true/>
         </dict>
         <dict>
@@ -993 +993 @@
                                         <key>sizes</key>
                                         <array>
-                                            <string>{{0, 0}, {366, 168}}</string>
-                                            <string>{{0, 173}, {366, 270}}</string>
+                                            <string>{{0, 0}, {491, 168}}</string>
+                                            <string>{{0, 173}, {491, 270}}</string>
                                         </array>
                                     </dict>
@@ -1043 +1043 @@
             <array>
                 <string>1C0AD2B3069F1EA900FABCE6</string>
-                <string>F5614B8A08F0EED200BD51D8</string>
+                <string>F530029608F11B1500BE3F3C</string>
                 <string>1CD0528B0623707200166675</string>
-                <string>F5614B8B08F0EED200BD51D8</string>
+                <string>F530029708F11B1500BE3F3C</string>
             </array>
             <key>ToolbarConfiguration</key>

NEWT0/trunk/newt.xcode/gnue.pbxuser

@@ -150 +150 @@
                 );
             };
-            PBXPerProjectTemplateStateSaveDate = 150007345;
+            PBXPerProjectTemplateStateSaveDate = 150018734;
             PBXPrepackagedSmartGroups_v2 = (
                 {
@@ -829 +829 @@
                 RubberWindowFrame = "374 174 745 468 0 0 1024 746 ";
             };
-            PBXWorkspaceStateSaveDate = 150007345;
+            PBXWorkspaceStateSaveDate = 150018734;
         };
         perUserProjectItems = {
@@ -838 +838 @@
             F528D7D308ABFE000001CB53 = F528D7D308ABFE000001CB53;
             F528D7D508ABFE000001CB53 = F528D7D508ABFE000001CB53;
+            F530028908F11AC800BE3F3C = F530028908F11AC800BE3F3C;
+            F530029D08F11B2700BE3F3C = F530029D08F11B2700BE3F3C;
+            F530029E08F11B2700BE3F3C = F530029E08F11B2700BE3F3C;
+            F530029F08F11B2700BE3F3C = F530029F08F11B2700BE3F3C;
+            F53002A008F11B2700BE3F3C = F53002A008F11B2700BE3F3C;
+            F53002A508F11B2700BE3F3C = F53002A508F11B2700BE3F3C;
             F532AA3C08AADBB500EE12BF = F532AA3C08AADBB500EE12BF;
-            F532AA3D08AADBB500EE12BF = F532AA3D08AADBB500EE12BF;
             F532AA6D08AADC9500EE12BF = F532AA6D08AADC9500EE12BF;
             F5547480088A7A9B001E9DDF = F5547480088A7A9B001E9DDF;
@@ -863 +868 @@
             F55475A0088A8347001E9DDF = F55475A0088A8347001E9DDF;
             F55475AA088A83B6001E9DDF = F55475AA088A83B6001E9DDF;
-            F5614BA408F0EF2500BD51D8 = F5614BA408F0EF2500BD51D8;
-            F5614BB808F0EFC400BD51D8 = F5614BB808F0EFC400BD51D8;
-            F5614BB908F0EFC400BD51D8 = F5614BB908F0EFC400BD51D8;
-            F5614BBA08F0EFC400BD51D8 = F5614BBA08F0EFC400BD51D8;
-            F5614BBD08F0EFC400BD51D8 = F5614BBD08F0EFC400BD51D8;
             F574E95108BF6AA600C73DAE = F574E95108BF6AA600C73DAE;
             F574E95308BF6AA600C73DAE = F574E95308BF6AA600C73DAE;
@@ -995 +995 @@
         vrLoc = 1097;
     };
+    F530028908F11AC800BE3F3C = {
+        fRef = F5ACB06706412D4900DB6CF9;
+        isa = PBXTextBookmark;
+        rLen = 10;
+        rLoc = 1993;
+        rType = 0;
+    };
+    F530029D08F11B2700BE3F3C = {
+        fRef = F5ACB06A06412D4900DB6CF9;
+        isa = PBXTextBookmark;
+        name = NewtRefFunctionType;
+        rLen = 19;
+        rLoc = 37025;
+        rType = 0;
+        vrLen = 499;
+        vrLoc = 36832;
+    };
+    F530029E08F11B2700BE3F3C = {
+        fRef = F5E14ADB057984FA009742A2;
+        isa = PBXTextBookmark;
+        name = "version.h: NEWT_BUILD";
+        rLen = 0;
+        rLoc = 526;
+        rType = 0;
+        vrLen = 919;
+        vrLoc = 226;
+    };
+    F530029F08F11B2700BE3F3C = {
+        fRef = F5ACB06A06412D4900DB6CF9;
+        isa = PBXTextBookmark;
+        name = NewtRefFunctionType;
+        rLen = 19;
+        rLoc = 37025;
+        rType = 0;
+        vrLen = 499;
+        vrLoc = 36832;
+    };
+    F53002A008F11B2700BE3F3C = {
+        fRef = F5E14ADB057984FA009742A2;
+        isa = PBXTextBookmark;
+        name = "version.h: NEWT_BUILD";
+        rLen = 0;
+        rLoc = 528;
+        rType = 0;
+        vrLen = 919;
+        vrLoc = 226;
+    };
+    F53002A508F11B2700BE3F3C = {
+        fRef = F5ACB06706412D4900DB6CF9;
+        isa = PBXTextBookmark;
+        name = NewtStrNBeginsWith;
+        rLen = 18;
+        rLoc = 76121;
+        rType = 0;
+        vrLen = 759;
+        vrLoc = 75808;
+    };
     F532AA3C08AADBB500EE12BF = {
         fRef = F5DE1345082AD4A500BB42A5;
@@ -1004 +1061 @@
         vrLen = 316;
         vrLoc = 208;
-    };
-    F532AA3D08AADBB500EE12BF = {
-        fRef = F5ACB06A06412D4900DB6CF9;
-        isa = PBXTextBookmark;
-        name = NewtRefFunctionType;
-        rLen = 19;
-        rLoc = 37025;
-        rType = 0;
-        vrLen = 499;
-        vrLoc = 36832;
     };
     F532AA6D08AADC9500EE12BF = {
@@ -1307 +1354 @@
         };
     };
-    F5614BA408F0EF2500BD51D8 = {
-        fRef = F5ACB06706412D4900DB6CF9;
-        isa = PBXTextBookmark;
-        rLen = 0;
-        rLoc = 2035;
-        rType = 0;
-    };
-    F5614BB808F0EFC400BD51D8 = {
-        fRef = F5E14ADB057984FA009742A2;
-        isa = PBXTextBookmark;
-        name = "version.h: NEWT_BUILD";
-        rLen = 0;
-        rLoc = 526;
-        rType = 0;
-        vrLen = 919;
-        vrLoc = 226;
-    };
-    F5614BB908F0EFC400BD51D8 = {
-        fRef = F5E14ADB057984FA009742A2;
-        isa = PBXTextBookmark;
-        name = "version.h: NEWT_BUILD";
-        rLen = 0;
-        rLoc = 526;
-        rType = 0;
-        vrLen = 919;
-        vrLoc = 226;
-    };
-    F5614BBA08F0EFC400BD51D8 = {
-        fRef = F5ACB06A06412D4900DB6CF9;
-        isa = PBXTextBookmark;
-        name = NewtRefFunctionType;
-        rLen = 19;
-        rLoc = 37025;
-        rType = 0;
-        vrLen = 499;
-        vrLoc = 36832;
-    };
-    F5614BBD08F0EFC400BD51D8 = {
-        fRef = F5ACB06706412D4900DB6CF9;
-        isa = PBXTextBookmark;
-        name = NewtStrNBeginsWith;
-        rLen = 18;
-        rLoc = 1960;
-        rType = 0;
-        vrLen = 1313;
-        vrLoc = 1131;
-    };
     F5622ED907E0273B009AAF9A = {
         uiCtxt = {
@@ -1582 +1582 @@
     F5ACB06706412D4900DB6CF9 = {
         uiCtxt = {
-            sepNavIntBoundsRect = "{{0, 0}, {728, 56557}}";
-            sepNavSelRange = "{1960, 18}";
-            sepNavVisRect = "{{0, 465}, {711, 429}}";
+            sepNavIntBoundsRect = "{{0, 0}, {747, 56473}}";
+            sepNavSelRange = "{1993, 10}";
+            sepNavVisRect = "{{0, 496}, {747, 369}}";
             sepNavWindowFrame = "{{355, 125}, {750, 558}}";
         };
@@ -1608 +1608 @@
             sepNavIntBoundsRect = "{{0, 0}, {678, 54608}}";
             sepNavSelRange = "{37025, 19}";
-            sepNavVisRect = "{{0, 24099}, {566, 331}}";
+            sepNavVisRect = "{{0, 24097}, {566, 331}}";
             sepNavWindowFrame = "{{223, 175}, {750, 558}}";
         };
@@ -1783 +1783 @@
         uiCtxt = {
             sepNavIntBoundsRect = "{{0, 0}, {566, 725}}";
-            sepNavSelRange = "{526, 0}";
+            sepNavSelRange = "{528, 0}";
             sepNavVisRect = "{{0, 140}, {566, 331}}";
             sepNavWindowFrame = "{{377, 154}, {750, 558}}";

NEWT0/trunk/src/newt_core/NewtObj.c

@@ -3687 +3687 @@
 bool NewtStrNBeginsWith(char * str, uint32_t len, char * sub, uint32_t sublen)
 {
-    while (0 < len && 0 < sublen && *str != '\0' && *sub != '\0')
-    {
-        if (*str != *sub)
-            return false;
-
-        str++; len--;
-        sub++; sublen--;
-    }
-
-    return (sublen == 0 || *sub == '\0');
+    if (len < sublen)
+        return false;
+    else
+        return (strncasecmp(str, sub, sublen) == 0);
 }
 

NEWT0/trunk/src/version.h

@@ -19 +19 @@
 #define NEWT_VERSION    "0.1.1"                                 ///< �o�[�W����
 #define NEWT_COPYRIGHT  "Copyright (C) 2003-2005 Makoto Nukui"  ///< �R�s�[���C�g
-#define NEWT_BUILD      "2005-10-03-1"                          ///< �r���h�ԍ�
+#define NEWT_BUILD      "2005-10-03-2"                          ///< �r���h�ԍ�
 #define NEWT_PARAMS     "[switches] [--] [programfile]"         ///< ��/// �g�p��define NEWT_USAGE      "  -t              enable trace mode\n"         \
                         "  -l              dump lex info\n"             \