2
0
Эх сурвалжийг харах

Use LoadText instead of LoadString - for better unicode support.
Fixed BMXPATH config loader.
Added Framework to test.

woollybah 11 жил өмнө
parent
commit
d6ed701920

+ 1 - 1
options.bmx

@@ -175,7 +175,7 @@ Function CheckConfig()
 	Local config:TConfigMap = New TConfigMap.Init("bcc.conf")
 	
 	If config.GetString("BMXPATH") <> ""
-		putenv_("BMXPATH="+config.GetString("BMXPATH_MACOS"))
+		putenv_("BMXPATH="+config.GetString("BMXPATH"))
 	EndIf
 
 End Function

+ 3 - 3
parser.bmx

@@ -2184,7 +2184,7 @@ End Rem
 
 		If FileType(path) = FILETYPE_FILE Then
 
-			Local toker:TToker=New TToker.Create( path,LoadString( path ) )
+			Local toker:TToker=New TToker.Create( path,LoadText( path ) )
 			toker.NextToke
 			
 			While True
@@ -2542,7 +2542,7 @@ Function PreProcess$( path$ )
 
 	Local ifnest:Int,con:Int=1,line:Int,source:TStringList=New TStringList
 
-	Local toker:TToker=New TToker.Create( path,LoadString( path ) )
+	Local toker:TToker=New TToker.Create( path,LoadText( path ) )
 
 	toker.NextToke
 
@@ -2687,7 +2687,7 @@ End Function
 Function ParseModule:TModuleDecl( path$,app:TAppDecl )
 
 	'Local source$=PreProcess( path )
-	Local source:String = LoadString(path)
+	Local source:String = LoadText(path)
 
 	Local toker:TToker=New TToker.Create( path,source )
 

+ 3 - 0
tests/framework/streams/utf8_01.bmx

@@ -1,4 +1,7 @@
 SuperStrict
+
+Framework BRL.StandardIO
+
 'HINT 1: this file must be saved with "Unicode BOM" to get recognized
 '        correctly by bmk/bcc
 '        So enable it in your editor of choice