summaryrefslogtreecommitdiff
path: root/src/minimacro.cpp
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2008-06-07 05:30:58 +0000
committerMike Buland <eichlan@xagasoft.com>2008-06-07 05:30:58 +0000
commit555ba77568b6faf18ebaed06cd08615deab2d8e3 (patch)
treedb4586b7849b1fbdc045c36b386dac0345b82d99 /src/minimacro.cpp
parentdc95fa94c1a8bb7249034d6fd2e61f80df48b317 (diff)
downloadlibbu++-555ba77568b6faf18ebaed06cd08615deab2d8e3.tar.gz
libbu++-555ba77568b6faf18ebaed06cd08615deab2d8e3.tar.bz2
libbu++-555ba77568b6faf18ebaed06cd08615deab2d8e3.tar.xz
libbu++-555ba77568b6faf18ebaed06cd08615deab2d8e3.zip
This is a testing version. Nothing should be broken, but I won't gurantee it.
I wouldn't update to this just yet, if you have problems, back off a rev. I'm trying to update the code to work on both 32bit, and 64bit systems, and hopefully anything else that comes along. Currently some of the archive code is broken, testing must be done on both archetectures.
Diffstat (limited to 'src/minimacro.cpp')
-rw-r--r--src/minimacro.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/minimacro.cpp b/src/minimacro.cpp
index c6a868f..5fd7333 100644
--- a/src/minimacro.cpp
+++ b/src/minimacro.cpp
@@ -62,7 +62,7 @@ Bu::FString Bu::MiniMacro::parse( const Bu::FString &sIn )
62 } 62 }
63 } 63 }
64 64
65 iLastPos = (int)sCur - (int)sIn.getStr(); 65 iLastPos = (ptrdiff_t)sCur - (ptrdiff_t)sIn.getStr();
66 66
67 return sOut; 67 return sOut;
68} 68}
@@ -76,7 +76,7 @@ Bu::FString Bu::MiniMacro::parseRepl()
76 for(; *sNext != ':' && *sNext != '}' && *sNext != '\0'; sNext++ ); 76 for(; *sNext != ':' && *sNext != '}' && *sNext != '\0'; sNext++ );
77 if( *sNext == '\0' ) 77 if( *sNext == '\0' )
78 break; 78 break;
79 Bu::FString sName( sCur, (int)sNext-(int)sCur ); 79 Bu::FString sName( sCur, (ptrdiff_t)sNext-(ptrdiff_t)sCur );
80 if( bIsFirst ) 80 if( bIsFirst )
81 { 81 {
82 sOut = hVars[sName]; 82 sOut = hVars[sName];
@@ -116,7 +116,7 @@ Bu::FString Bu::MiniMacro::parseCmd()
116 for(; *sNext != ':' && *sNext != '}' && *sNext != '\0'; sNext++ ); 116 for(; *sNext != ':' && *sNext != '}' && *sNext != '\0'; sNext++ );
117 if( *sNext != '\0' ) 117 if( *sNext != '\0' )
118 { 118 {
119 Bu::FString sName( sCur, (int)sNext-(int)sCur ); 119 Bu::FString sName( sCur, (ptrdiff_t)sNext-(ptrdiff_t)sCur );
120 if( sName == "end" ) 120 if( sName == "end" )
121 { 121 {
122 sCur = sNext; 122 sCur = sNext;
@@ -152,7 +152,7 @@ Bu::FString Bu::MiniMacro::callFunc(
152 for(; *s == ' ' || *s == '\t' || *s == '\r' || *s == '\n'; s++ ); 152 for(; *s == ' ' || *s == '\t' || *s == '\r' || *s == '\n'; s++ );
153 const char *sNext; 153 const char *sNext;
154 for( sNext = s; *sNext && *sNext != ')' && *sNext != ','; sNext++ ); 154 for( sNext = s; *sNext && *sNext != ')' && *sNext != ','; sNext++ );
155 Bu::FString p( s, (int)sNext-(int)s ); 155 Bu::FString p( s, (ptrdiff_t)sNext-(ptrdiff_t)s );
156 lsParams.append( p ); 156 lsParams.append( p );
157 sNext++; 157 sNext++;
158 s = sNext; 158 s = sNext;