AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-19 04:06:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some more string.format

Browse Source 
o,u,x,X does not respond to explicitPlus or space
implemented #
fixed "repeating flags" check
This commit is contained in:
gamax92 2014-07-11 11:32:30 -06:00
parent b9756bc554
commit 26bcd8ac29
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/org/luaj/vm3/lib/StringLib.java
View File

@ -373,7 +373,7 @@ public class StringLib extends TwoArgFunction {
default: moreFlags = false; break; default: moreFlags = false; break;
} }
} }
if ( p - start > MAX_FLAGS ) if ( p - start - 1 > MAX_FLAGS )
error("invalid format (repeated flags)"); error("invalid format (repeated flags)");
width = -1; width = -1;
@ -442,8 +442,18 @@ public class StringLib extends TwoArgFunction {
if ( number < 0 ) { if ( number < 0 ) {
ndigits--; ndigits--;
} else if ( explicitPlus || space ) { }
minwidth++;
if ( alternateForm ) {
switch ( conversion ) {
case 'o':
minwidth++;
break;
case 'x':
case 'X':
minwidth+=2;
break;
}
} }
if ( precision > ndigits ) if ( precision > ndigits )
@ -464,10 +474,19 @@ public class StringLib extends TwoArgFunction {
buf.append( (byte)'-' ); buf.append( (byte)'-' );
digits = digits.substring( 1 ); digits = digits.substring( 1 );
} }
} else if ( explicitPlus ) { }
buf.append( (byte)'+' );
} else if ( space ) { if ( alternateForm ) {
buf.append( (byte)' ' ); switch ( conversion ) {
case 'o':
buf.append( (byte)'0' );
case 'x':
buf.append( "0x" );
break;
case 'X':
buf.append( "0X" );
break;
}
} }
if ( nzeros > 0 ) if ( nzeros > 0 )