Skip to content

Beginning unicode support #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Beginning unicode support #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
098437e
beginning unicode support
mepeisen Mar 17, 2018
dc6607f
Merge branch 'master' of https://github.com/dan200/ComputerCraft
mepeisen Mar 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions luaj-2.0.3/src/core/org/luaj/vm2/Buffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,15 @@ public final class Buffer {
private static final int DEFAULT_CAPACITY = 64;

/** Shared static array with no bytes */
private static final byte[] NOBYTES = {};
/* UTF8 START */
private static final char[] NOBYTES = {};
/* UTF8 END */

/** Bytes in this buffer */
private byte[] bytes;
/* UTF8 START */
//private char[] bytes;
private char[] bytes;
/* UTF8 END */

/** Length of this buffer */
private int length;
Expand All @@ -68,7 +73,10 @@ public Buffer() {
* @param initialCapacity the initial capacity
*/
public Buffer( int initialCapacity ) {
bytes = new byte[ initialCapacity ];
/* UTF8 START */
// bytes = new byte[ initialCapacity ];
bytes = new char[ initialCapacity ];
/* UTF8 END */
length = 0;
offset = 0;
value = null;
Expand Down Expand Up @@ -132,7 +140,10 @@ public String toString() {
* Append a single byte to the buffer.
* @return {@code this} to allow call chaining
*/
public final Buffer append( byte b ) {
/* UTF8 START */
public final Buffer append( char b ) {
// public final Buffer append( byte b ) {
/* UTF8 END */
makeroom( 0, 1 );
bytes[ offset + length++ ] = b;
return this;
Expand Down Expand Up @@ -174,13 +185,17 @@ public final Buffer append( String str ) {
LuaString.encodeToUtf8( chars, bytes, offset + length );
length += n;
*/
makeroom( 0, chars.length );
for( int i=0; i<chars.length; ++i )
{
char ch = chars[i];
bytes[ offset + length + i ] = (ch < 256) ? (byte)ch : (byte)'?';
}
/* UTF8 START */
// makeroom( 0, chars.length );
// for( int i=0; i<chars.length; ++i )
// {
// char ch = chars[i];
// bytes[ offset + length + i ] = (ch < 256) ? (byte)ch : (byte)'?';
// }
makeroom(0, chars.length);
System.arraycopy(chars, 0, bytes, offset + length, chars.length);
length += chars.length;
/* UTF8 END */
/* DAN200 END */
return this;
}
Expand Down Expand Up @@ -235,7 +250,10 @@ public final void makeroom( int nbefore, int nafter ) {
value = null;
length = s.m_length;
offset = nbefore;
bytes = new byte[nbefore+length+nafter];
/* UTF8 START */
bytes = new char[nbefore+length+nafter];
// bytes = new byte[nbefore+length+nafter];
/* UTF8 END */
System.arraycopy(s.m_bytes, s.m_offset, bytes, offset, length);
} else if ( offset+length+nafter > bytes.length || offset<nbefore ) {
int n = nbefore+length+nafter;
Expand All @@ -250,7 +268,10 @@ public final void makeroom( int nbefore, int nafter ) {
*/
private final void realloc( int newSize, int newOffset ) {
if ( newSize != bytes.length ) {
byte[] newBytes = new byte[ newSize ];
/* DAN200 START */
// byte[] newBytes = new byte[ newSize ];
char[] newBytes = new char[ newSize ];
/* DAN200 END */
System.arraycopy( bytes, offset, newBytes, newOffset, length );
bytes = newBytes;
offset = newOffset;
Expand Down
Loading