Packman Build Service PMBS

lightspark.spec Changed

lightspark.tar.xz/src/parsing/streams.cpp Changed

lightspark.tar.xz/src/parsing/streams.h Changed

lightspark.tar.xz/src/scripting/abc.cpp Changed

lightspark.tar.xz/src/scripting/abc_interpreter.cpp Changed

lightspark.tar.xz/src/scripting/abc_opcodes.cpp Changed

lightspark.tar.xz/src/scripting/class.h Changed

lightspark.tar.xz/src/scripting/toplevel/toplevel.cpp Changed

@@ -767,14 +767,14 @@
 
 Class_base::Class_base(const QName& name, MemoryAccount* m):ASObject(Class_object::getClass()),protected_ns("",NAMESPACE),constructor(NULL),
 	borrowedVariables(m),
-	context(NULL),class_name(name),memoryAccount(m),length(1),class_index(-1),isFinal(false),isSealed(false),use_protected(false)
+	context(NULL),class_name(name),memoryAccount(m),length(1),class_index(-1),isFinal(false),isSealed(false),isInterface(false),use_protected(false)
 {
 	type=T_CLASS;
 }
 
 Class_base::Class_base(const Class_object*):ASObject((MemoryAccount*)NULL),protected_ns("",NAMESPACE),constructor(NULL),
 	borrowedVariables(NULL),
-	context(NULL),class_name("Class",""),memoryAccount(NULL),length(1),class_index(-1),isFinal(false),isSealed(false),use_protected(false)
+	context(NULL),class_name("Class",""),memoryAccount(NULL),length(1),class_index(-1),isFinal(false),isSealed(false),isInterface(false),use_protected(false)
 {
 	type=T_CLASS;
 	//We have tested that (Class is Class == true) so the classdef is 'this'
@@ -1145,8 +1145,9 @@
 {
 	assert(class_index!=-1);
 	//Recursively link interfaces implemented by this interface
-	for(unsigned int i=0;i<getInterfaces().size();i++)
-		getInterfaces()[i]->linkInterface(c);
+	const std::vector<Class_base*> interfaces = getInterfaces();
+	for(unsigned int i=0;i<interfaces.size();i++)
+		interfaces[i]->linkInterface(c);
 
 	assert_and_throw(context);
 
@@ -1172,11 +1173,13 @@
 		return true;
 
 	//Now check the interfaces
-	if (considerInterfaces)
+	//an interface can't be subclass of a normal class, we only check the interfaces if cls is an interface itself
+	if (considerInterfaces && cls->isInterface)
 	{
-		for(unsigned int i=0;i<getInterfaces().size();i++)
+		const std::vector<Class_base*> interfaces = getInterfaces();
+		for(unsigned int i=0;i<interfaces.size();i++)
 		{
-			if(getInterfaces()[i]->isSubClass(cls, considerInterfaces))
+			if(interfaces[i]->isSubClass(cls, considerInterfaces))
 				return true;
 		}
 	}

lightspark.tar.xz/src/scripting/toplevel/toplevel.h Changed

lightspark.tar.xz/src/tiny_string.cpp Changed

@@ -65,6 +65,7 @@
 		buf=r.buf;
 		this->isASCII = r.isASCII;
 		this->hasNull = r.hasNull;
+		this->numchars = r.numchars;
 		return;
 	}
 	if(stringSize > STATIC_SIZE)
@@ -72,6 +73,7 @@
 	memcpy(buf,r.buf,stringSize);
 	this->isASCII = r.isASCII;
 	this->hasNull = r.hasNull;
+	this->numchars = r.numchars;
 }
 
 tiny_string::tiny_string(const std::string& r):_buf_static(),buf(_buf_static),stringSize(r.size()+1),type(STATIC)
@@ -105,6 +107,7 @@
 	}
 	this->isASCII = s.isASCII;
 	this->hasNull = s.hasNull;
+	this->numchars = s.numchars;
 	return *this;
 }
 
@@ -210,6 +213,7 @@
 		this->isASCII = r.isASCII;
 	if (!this->hasNull)
 		this->hasNull = r.hasNull;
+	this->numchars += r.numchars;
 	return *this;
 }
 
@@ -321,6 +325,8 @@
 /* returns the length in utf-8 characters, not counting the trailing \0 */
 uint32_t tiny_string::numChars() const
 {
+	return numchars;
+	/*
 	if (isASCII)
 		return stringSize-1;
 	if (!hasNull)
@@ -335,6 +341,7 @@
 		++len;
 	}
 	return len;
+	*/
 }
 
 char* tiny_string::strchr(char c) const
@@ -440,17 +447,32 @@
 	_buf_static[0] = '\0';
 	buf=_buf_static;
 	type=STATIC;
-	init();
 }
 
 void tiny_string::init()
 {
+	numchars = 0;
 	isASCII = true;
 	hasNull = false;
+	unsigned char utfpos=0;
 	for (uint i = 0; i < stringSize-1; i++)
 	{
 		if (buf[i] & 0x80)
+		{
+			if (utfpos == 0)
+			{
+				utfpos = buf[i];
+			}
+			utfpos = utfpos << 1;
+			if (!(utfpos & 0x80))
+			{
+				numchars++;
+				utfpos = 0;
+			}
 			isASCII = false;
+		}
+		else
+			numchars++;
 		if (buf[i] == 0)
 			hasNull = true;
 	}
@@ -461,10 +483,11 @@
 	tiny_string ret;
 	ret.buf = ret._buf_static;
 	ret.type = STATIC;
-	ret.stringSize = g_unichar_to_utf8(c,ret.buf) + 1;
+	ret.stringSize = c&0x80 ? 2 : g_unichar_to_utf8(c,ret.buf) + 1;
 	ret.buf[ret.stringSize-1] = '\0';
 	ret.isASCII = c<0x80;
 	ret.hasNull = c == 0;
+	ret.numchars = 1;
 	return ret;
 }
 
@@ -497,7 +520,9 @@
 	memcpy(ret.buf,buf+start,len);
 	ret.buf[len]=0;
 	ret.stringSize = len+1;
-	if (!this->isASCII || this->hasNull)
+	if (this->isASCII && !this->hasNull)
+		ret.numchars = len;
+	else
 		ret.init();
 	return ret;
 }

lightspark.tar.xz/src/tiny_string.h Changed

Changes of Revision 98