kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run Haxe formatter

Browse Source
This commit is contained in:
Joshua Granick
2022-03-23 14:02:39 -07:00
parent 362be074f4
commit 1c92c707cc
37 changed files with 733 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
docs/build.hx
View File

@@ -57,9 +57,30 @@ class Build extends Script
html5.build();
System.runCommand("", "haxelib", [
"run", "dox", "-i", "xml", "-in", "lime", "--title", "Lime API Reference", "-D", "source-path",
"https://github.com/haxelime/lime/tree/develop/src/", "-D", "website", "http://lime.software", "-D", "logo", "/images/logo.png", "-D", "textColor",
"0x777777", "-theme", "../assets/docs-theme", "--toplevel-package", "lime"
"run",
"dox",
"-i",
"xml",
"-in",
"lime",
"--title",
"Lime API Reference",
"-D",
"source-path",
"https://github.com/haxelime/lime/tree/develop/src/",
"-D",
"website",
"http://lime.software",
"-D",
"logo",
"/images/logo.png",
"-D",
"textColor",
"0x777777",
"-theme",
"../assets/docs-theme",
"--toplevel-package",
"lime"
]);
}
}

2
src/lime/_internal/backend/native/NativeApplication.hx
View File

@@ -739,7 +739,7 @@ class NativeApplication
@:keep /*private*/ class KeyEventInfo
{
public var keyCode: #if neko Float #else Int #end;
public var keyCode:#if neko Float #else Int #end;
public var modifier:Int;
public var type:KeyEventType;
public var windowID:Int;

3
src/lime/_internal/backend/native/NativeAudioSource.hx
View File

@@ -298,7 +298,8 @@ class NativeAudioSource
// of data, which typically happens if an operation (such as
// resizing a window) freezes the main thread.
// If AL is supposed to be playing but isn't, restart it here.
if (playing && handle != null && AL.getSourcei(handle, AL.SOURCE_STATE) == AL.STOPPED){
if (playing && handle != null && AL.getSourcei(handle, AL.SOURCE_STATE) == AL.STOPPED)
{
AL.sourcePlay(handle);
}
}

6
src/lime/_internal/backend/native/NativeHTTPRequest.hx
View File

@@ -241,8 +241,10 @@ class NativeHTTPRequest
// an empty string means store cookies in memory
// cookies are stored only for the current session
curl.setOption(COOKIEFILE, "");
if (cookieList != null) {
for(cookie in cookieList) {
if (cookieList != null)
{
for (cookie in cookieList)
{
// pass in each stored cookie individually
curl.setOption(COOKIELIST, cookie);
}

9
src/lime/graphics/opengl/GLShader.hx
View File

@@ -34,7 +34,8 @@ public static function fromSource(gl:WebGLRenderContext, source:String, type:Int
var message;
if (compileStatus == 0) message = "Error ";
else message = "Info ";
else
message = "Info ";
if (type == gl.VERTEX_SHADER) message = "compiling vertex shader";
else if (type == gl.FRAGMENT_SHADER) message = "compiling fragment shader";
@@ -43,10 +44,8 @@ public static function fromSource(gl:WebGLRenderContext, source:String, type:Int
message += "\n" + shaderInfoLog;
if(compileStatus == 0)
Log.error(message);
else if(shaderInfoLog != null)
Log.debug(message);
if (compileStatus == 0) Log.error(message);
else if (shaderInfoLog != null) Log.debug(message);
}
return shader;

1
src/lime/net/URIParser.hx
View File

@@ -1,6 +1,5 @@
package lime.net;
/**
Class used for parsing URIs and URLs.
Based on http://blog.stevenlevithan.com/archives/parseuri

3
src/lime/tools/ApplicationData.hx
View File

@@ -13,7 +13,8 @@ typedef ApplicationData =
@:dox(hide) class _ApplicationDataType
{
public static var fields:ApplicationData = {
public static var fields:ApplicationData =
{
file: "",
init: "",
main: "",

4
src/lime/tools/AssetHelper.hx
View File

@@ -297,8 +297,8 @@ class AssetHelper
{
if (output.tell() == 0)
{
//write some dummy text at the start of the packed asset file just to prevent
//the file from beginning with a packed file header.
// write some dummy text at the start of the packed asset file just to prevent
// the file from beginning with a packed file header.
output.writeString("lime-asset-pack");
}

11
src/lime/tools/CSHelper.hx
View File

@@ -221,7 +221,16 @@ class CSHelper
noCompile:Bool = false)
{
var args = [
"run", project.config.getString("cs.buildLibrary", "hxcs"), buildFile, "--arch", arch, "--platform", platform, "--out", outPath, "--unsafe"
"run",
project.config.getString("cs.buildLibrary", "hxcs"),
buildFile,
"--arch",
arch,
"--platform",
platform,
"--out",
outPath,
"--unsafe"
];
if (noCompile) args.push("--no-compile");
var code = Haxelib.runCommand(path, args);

15
src/lime/tools/HXProject.hx
View File

@@ -382,8 +382,19 @@ class HXProject extends Script
#if lime
var args = [
name, "-main", "lime.tools.HXProject", "-cp", tempDirectory, "-neko", nekoOutput, "-cp", Path.combine(Haxelib.getPath(new Haxelib("hxp")), "src"),
"-lib", "lime", "-lib", "hxp"
name,
"-main",
"lime.tools.HXProject",
"-cp",
tempDirectory,
"-neko",
nekoOutput,
"-cp",
Path.combine(Haxelib.getPath(new Haxelib("hxp")), "src"),
"-lib",
"lime",
"-lib",
"hxp"
];
#else
var args = [

4
src/lime/tools/Library.hx
View File

@@ -12,8 +12,8 @@ class Library
public var sourcePath:String;
public var type:String;
public function new(sourcePath:String, name:String = "", type:String = null, embed:Null<Bool> = null, preload:Null<Bool> = null, generate:Null<Bool> = null,
prefix:String = "")
public function new(sourcePath:String, name:String = "", type:String = null, embed:Null<Bool> = null, preload:Null<Bool> = null,
generate:Null<Bool> = null, prefix:String = "")
{
this.sourcePath = sourcePath;

3
src/lime/tools/MetaData.hx
View File

@@ -14,7 +14,8 @@ typedef MetaData =
@:dox(hide) class _MetaDataType
{
public static var fields:MetaData = {
public static var fields:MetaData =
{
buildNumber: "",
company: "",
companyId: "",

3
src/lime/tools/WindowData.hx
View File

@@ -35,7 +35,8 @@ typedef WindowData =
@:dox(hide) class _WindowDataType
{
public static var fields:WindowData = {
public static var fields:WindowData =
{
width: 0,
height: 0,
x: 0.0,

3
src/lime/ui/FileDialog.hx
View File

@@ -41,7 +41,6 @@ import js.html.Blob;
Availability note: most file dialog operations are only available on desktop targets, though
`save()` is also available in HTML5.
**/
#if !lime_debug
@:fileXml('tags="haxe,release"')
@:noDebug
@@ -50,7 +49,6 @@ import js.html.Blob;
@:access(lime.graphics.Image)
class FileDialog
{
/**
Triggers when the user clicks "Cancel" during any operation, or when a function is unsupported
(such as `open()` on HTML5).
@@ -80,7 +78,6 @@ class FileDialog
**/
public var onSelectMultiple = new Event<Array<String>->Void>();
public function new() {}
/**

4
src/lime/utils/Float32Array.hx
View File

@@ -97,7 +97,9 @@ abstract Float32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
public var length(get, never):Int;
#if (haxe_ver < 4.2) @:generic #end
#if (haxe_ver < 4.2)
@:generic
#end
public inline function new<T>(?elements:Int, ?buffer:ArrayBuffer, ?array:Array<T>, #if openfl ?vector:openfl.Vector<Float>, #end ?view:ArrayBufferView,
?byteoffset:Int = 0, ?len:Null<Int>)
{

4
src/lime/utils/Float64Array.hx
View File

@@ -94,7 +94,9 @@ abstract Float64Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
public var length(get, never):Int;
#if (haxe_ver < 4.2) @:generic #end
#if (haxe_ver < 4.2)
@:generic
#end
public inline function new<T>(?elements:Int, ?buffer:ArrayBuffer, ?array:Array<T>, #if openfl ?vector:openfl.Vector<Float>, #end ?view:ArrayBufferView,
?byteoffset:Int = 0, ?len:Null<Int>)
{

4
src/lime/utils/Int16Array.hx
View File

@@ -94,7 +94,9 @@ abstract Int16Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
public var length(get, never):Int;
#if (haxe_ver < 4.2) @:generic #end
#if (haxe_ver < 4.2)
@:generic
#end
public inline function new<T>(?elements:Int, ?buffer:ArrayBuffer, ?array:Array<T>, #if openfl ?vector:openfl.Vector<Int>, #end ?view:ArrayBufferView,
?byteoffset:Int = 0, ?len:Null<Int>)
{

5
src/lime/utils/Int32Array.hx
View File

@@ -85,6 +85,7 @@ abstract Int32Array(JSInt32Array) from JSInt32Array to JSInt32Array
}
#else
import lime.utils.ArrayBufferView;
@:transitive
@:forward
abstract Int32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
@@ -93,7 +94,9 @@ abstract Int32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
public var length(get, never):Int;
#if (haxe_ver < 4.2) @:generic #end
#if (haxe_ver < 4.2)
@:generic
#end
public inline function new<T>(?elements:Int, ?buffer:ArrayBuffer, ?array:Array<T>, #if openfl ?vector:openfl.Vector<Int>, #end ?view:ArrayBufferView,
?byteoffset:Int = 0, ?len:Null<Int>)
{

4
src/lime/utils/Int8Array.hx
View File

@@ -92,7 +92,9 @@ abstract Int8Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
public var length(get, never):Int;
#if (haxe_ver < 4.2) @:generic #end
#if (haxe_ver < 4.2)
@:generic
#end
public inline function new<T>(?elements:Int, ?buffer:ArrayBuffer, ?array:Array<T>, #if openfl ?vector:openfl.Vector<Int>, #end ?view:ArrayBufferView,
?byteoffset:Int = 0, ?len:Null<Int>)
{

4
src/lime/utils/Preloader.hx
View File

@@ -309,8 +309,8 @@ class Preloader #if flash extends Sprite #end
}
#end
if (!simulateProgress #if flash && loadedStage #end
#if !disable_preloader_assets && loadedLibraries == (libraries.length + libraryNames.length) #end)
if (!simulateProgress #if flash && loadedStage #end#if !disable_preloader_assets
&& loadedLibraries == (libraries.length + libraryNames.length) #end)
{
if (!preloadComplete)
{

5
src/lime/utils/UInt16Array.hx
View File

@@ -85,6 +85,7 @@ abstract UInt16Array(JSUInt16Array) from JSUInt16Array to JSUInt16Array
}
#else
import lime.utils.ArrayBufferView;
@:transitive
@:forward
abstract UInt16Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
@@ -93,7 +94,9 @@ abstract UInt16Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
public var length(get, never):Int;
#if (haxe_ver < 4.2) @:generic #end
#if (haxe_ver < 4.2)
@:generic
#end
public inline function new<T>(?elements:Int, ?buffer:ArrayBuffer, ?array:Array<T>, #if openfl ?vector:openfl.Vector<Int>, #end ?view:ArrayBufferView,
?byteoffset:Int = 0, ?len:Null<Int>)
{

5
src/lime/utils/UInt32Array.hx
View File

@@ -85,6 +85,7 @@ abstract UInt32Array(JSUInt32Array) from JSUInt32Array to JSUInt32Array
}
#else
import lime.utils.ArrayBufferView;
@:transitive
@:forward
abstract UInt32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
@@ -93,7 +94,9 @@ abstract UInt32Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
public var length(get, never):Int;
#if (haxe_ver < 4.2) @:generic #end
#if (haxe_ver < 4.2)
@:generic
#end
public inline function new<T>(?elements:Int, ?buffer:ArrayBuffer, ?array:Array<T>, #if openfl ?vector:openfl.Vector<Int>, #end ?view:ArrayBufferView,
?byteoffset:Int = 0, ?len:Null<Int>)
{

5
src/lime/utils/UInt8Array.hx
View File

@@ -83,6 +83,7 @@ abstract UInt8Array(JSUInt8Array) from JSUInt8Array to JSUInt8Array
}
#else
import lime.utils.ArrayBufferView;
@:transitive
@:forward
abstract UInt8Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
@@ -91,7 +92,9 @@ abstract UInt8Array(ArrayBufferView) from ArrayBufferView to ArrayBufferView
public var length(get, never):Int;
#if (haxe_ver < 4.2) @:generic #end
#if (haxe_ver < 4.2)
@:generic
#end
public inline function new<T>(?elements:Int, ?buffer:ArrayBuffer, ?array:Array<T>, #if openfl ?vector:openfl.Vector<Int>, #end ?view:ArrayBufferView,
?byteoffset:Int = 0, ?len:Null<Int>)
{

5
src/lime/utils/UInt8ClampedArray.hx
View File

@@ -94,6 +94,7 @@ abstract UInt8ClampedArray(JSUInt8ClampedArray) from JSUInt8ClampedArray to JSUI
}
#else
import lime.utils.ArrayBufferView;
@:transitive
@:forward
@:arrayAccess
@@ -103,7 +104,9 @@ abstract UInt8ClampedArray(ArrayBufferView) from ArrayBufferView to ArrayBufferV
public var length(get, never):Int;
#if (haxe_ver < 4.2) @:generic #end
#if (haxe_ver < 4.2)
@:generic
#end
public inline function new<T>(?elements:Int, ?buffer:ArrayBuffer, ?array:Array<T>, #if openfl ?vector:openfl.Vector<Int>, #end ?view:ArrayBufferView,
?byteoffset:Int = 0, ?len:Null<Int>)
{

4
tools/CommandLineTools.hx
View File

@@ -1858,7 +1858,7 @@ class CommandLineTools
if (Reflect.hasField(project, field))
{
var fieldValue = Reflect.field(project, field);
var typeValue:Dynamic = switch(field)
var typeValue:Dynamic = switch (field)
{
case "app": ApplicationData._ApplicationDataType.fields;
case "meta": MetaData._MetaDataType.fields;
@@ -2128,7 +2128,7 @@ class CommandLineTools
if (field == "meta-build-number") property = "buildNumber";
var fieldReference = Reflect.field(overrides, fieldName);
var typeValue:Dynamic = switch(fieldName)
var typeValue:Dynamic = switch (fieldName)
{
case "app": ApplicationData._ApplicationDataType.fields;
case "meta": MetaData._MetaDataType.fields;

3
tools/platforms/AIRPlatform.hx
View File

@@ -31,7 +31,8 @@ class AIRPlatform extends FlashPlatform
var defaults = new HXProject();
defaults.meta = {
defaults.meta =
{
title: "MyApplication",
description: "",
packageName: "com.example.myapp",

3
tools/platforms/AndroidPlatform.hx
View File

@@ -31,7 +31,8 @@ class AndroidPlatform extends PlatformTarget
var defaults = new HXProject();
defaults.meta = {
defaults.meta =
{
title: "MyApplication",
description: "",
packageName: "com.example.myapp",

3
tools/platforms/EmscriptenPlatform.hx
View File

@@ -29,7 +29,8 @@ class EmscriptenPlatform extends PlatformTarget
var defaults = new HXProject();
defaults.meta = {
defaults.meta =
{
title: "MyApplication",
description: "",
packageName: "com.example.myapp",

3
tools/platforms/FlashPlatform.hx
View File

@@ -36,7 +36,8 @@ class FlashPlatform extends PlatformTarget
var defaults = new HXProject();
defaults.meta = {
defaults.meta =
{
title: "MyApplication",
description: "",
packageName: "com.example.myapp",

3
tools/platforms/HTML5Platform.hx
View File

@@ -35,7 +35,8 @@ class HTML5Platform extends PlatformTarget
var defaults = new HXProject();
defaults.meta = {
defaults.meta =
{
title: "MyApplication",
description: "",
packageName: "com.example.myapp",

30
tools/platforms/IOSPlatform.hx
View File

@@ -40,7 +40,8 @@ class IOSPlatform extends PlatformTarget
var defaults = new HXProject();
defaults.meta = {
defaults.meta =
{
title: "MyApplication",
description: "",
packageName: "com.example.myapp",
@@ -554,12 +555,27 @@ class IOSPlatform extends PlatformTarget
System.mkdir(projectDirectory + "/haxe/lime/installer");
var iconSizes:Array<IconSize> = [
{name: "Icon-20.png", size: 20}, {name: "Icon-Small.png", size: 29}, {name: "Icon-Small-40.png", size: 40}, {name: "Icon-20@2x.png", size: 40},
{name: "Icon-Small-50.png", size: 50}, {name: "Icon.png", size: 57}, {name: "Icon-Small@2x.png", size: 58}, {name: "Icon-20@3x.png", size: 60},
{name: "Icon-72.png", size: 72}, {name: "Icon-76.png", size: 76}, {name: "Icon-Small-40@2x.png", size: 80}, {name: "Icon-Small@3x.png", size: 87},
{name: "Icon-Small-50@2x.png", size: 100}, {name: "Icon@2x.png", size: 114}, {name: "Icon-60@2x.png", size: 120},
{name: "Icon-Small-40@3x.png", size: 120}, {name: "Icon-72@2x.png", size: 144}, {name: "Icon-76@2x.png", size: 152},
{name: "Icon-83.5@2x.png", size: 167}, {name: "Icon-60@3x.png", size: 180}, {name: "Icon-Marketing.png", size: 1024}
{name: "Icon-20.png", size: 20},
{name: "Icon-Small.png", size: 29},
{name: "Icon-Small-40.png", size: 40},
{name: "Icon-20@2x.png", size: 40},
{name: "Icon-Small-50.png", size: 50},
{name: "Icon.png", size: 57},
{name: "Icon-Small@2x.png", size: 58},
{name: "Icon-20@3x.png", size: 60},
{name: "Icon-72.png", size: 72},
{name: "Icon-76.png", size: 76},
{name: "Icon-Small-40@2x.png", size: 80},
{name: "Icon-Small@3x.png", size: 87},
{name: "Icon-Small-50@2x.png", size: 100},
{name: "Icon@2x.png", size: 114},
{name: "Icon-60@2x.png", size: 120},
{name: "Icon-Small-40@3x.png", size: 120},
{name: "Icon-72@2x.png", size: 144},
{name: "Icon-76@2x.png", size: 152},
{name: "Icon-83.5@2x.png", size: 167},
{name: "Icon-60@3x.png", size: 180},
{name: "Icon-Marketing.png", size: 1024}
];
context.HAS_ICON = true;

18
tools/platforms/LinuxPlatform.hx
View File

@@ -37,7 +37,8 @@ class LinuxPlatform extends PlatformTarget
var defaults = new HXProject();
defaults.meta = {
defaults.meta =
{
title: "MyApplication",
description: "",
packageName: "com.example.myapp",
@@ -89,11 +90,16 @@ class LinuxPlatform extends PlatformTarget
switch (System.hostArchitecture)
{
case ARMV6: defaults.architectures = [ARMV6];
case ARMV7: defaults.architectures = [ARMV7];
case X86: defaults.architectures = [X86];
case X64: defaults.architectures = [X64];
default: defaults.architectures = [];
case ARMV6:
defaults.architectures = [ARMV6];
case ARMV7:
defaults.architectures = [ARMV7];
case X86:
defaults.architectures = [X86];
case X64:
defaults.architectures = [X64];
default:
defaults.architectures = [];
}
defaults.window.allowHighDPI = false;

18
tools/platforms/MacPlatform.hx
View File

@@ -41,7 +41,8 @@ class MacPlatform extends PlatformTarget
var defaults = new HXProject();
defaults.meta = {
defaults.meta =
{
title: "MyApplication",
description: "",
packageName: "com.example.myapp",
@@ -93,11 +94,16 @@ class MacPlatform extends PlatformTarget
switch (System.hostArchitecture)
{
case ARMV6: defaults.architectures = [ARMV6];
case ARMV7: defaults.architectures = [ARMV7];
case X86: defaults.architectures = [X86];
case X64: defaults.architectures = [X64];
default: defaults.architectures = [];
case ARMV6:
defaults.architectures = [ARMV6];
case ARMV7:
defaults.architectures = [ARMV7];
case X86:
defaults.architectures = [X86];
case X64:
defaults.architectures = [X64];
default:
defaults.architectures = [];
}
defaults.window.allowHighDPI = false;

21
tools/platforms/TVOSPlatform.hx
View File

@@ -38,7 +38,8 @@ class TVOSPlatform extends PlatformTarget
var defaults = new HXProject();
defaults.meta = {
defaults.meta =
{
title: "MyApplication",
description: "",
packageName: "com.example.myapp",
@@ -467,10 +468,20 @@ class TVOSPlatform extends PlatformTarget
System.mkdir(projectDirectory + "/haxe/lime/installer");
var iconSizes:Array<IconSize> = [
{name: "Icon-Small.png", size: 29}, {name: "Icon-Small-40.png", size: 40}, {name: "Icon-Small-50.png", size: 50}, {name: "Icon.png", size: 57},
{name: "Icon-Small@2x.png", size: 58}, {name: "Icon-72.png", size: 72}, {name: "Icon-76.png", size: 76}, {name: "Icon-Small-40@2x.png", size: 80},
{name: "Icon-Small-50@2x.png", size: 100}, {name: "Icon@2x.png", size: 114}, {name: "Icon-60@2x.png", size: 120},
{name: "Icon-72@2x.png", size: 144}, {name: "Icon-76@2x.png", size: 152}, {name: "Icon-60@3x.png", size: 180},
{name: "Icon-Small.png", size: 29},
{name: "Icon-Small-40.png", size: 40},
{name: "Icon-Small-50.png", size: 50},
{name: "Icon.png", size: 57},
{name: "Icon-Small@2x.png", size: 58},
{name: "Icon-72.png", size: 72},
{name: "Icon-76.png", size: 76},
{name: "Icon-Small-40@2x.png", size: 80},
{name: "Icon-Small-50@2x.png", size: 100},
{name: "Icon@2x.png", size: 114},
{name: "Icon-60@2x.png", size: 120},
{name: "Icon-72@2x.png", size: 144},
{name: "Icon-76@2x.png", size: 152},
{name: "Icon-60@3x.png", size: 180},
];
context.HAS_ICON = true;

7
tools/platforms/TizenPlatform.hx
View File

@@ -27,7 +27,8 @@ class TizenPlatform extends PlatformTarget
var defaults = new HXProject();
defaults.meta = {
defaults.meta =
{
title: "MyApplication",
description: "",
packageName: "com.example.myapp",
@@ -81,8 +82,8 @@ class TizenPlatform extends PlatformTarget
defaults.window.width = 0;
defaults.window.height = 0;
defaults.window.fullscreen = true;
defaults.window.requireShaders = true;=
defaults.window.allowHighDPI = false;
defaults.window.requireShaders = true;
= defaults.window.allowHighDPI = false;
for (i in 1...project.windows.length)
{

18
tools/platforms/WindowsPlatform.hx
View File

@@ -44,7 +44,8 @@ class WindowsPlatform extends PlatformTarget
var defaults = new HXProject();
defaults.meta = {
defaults.meta =
{
title: "MyApplication",
description: "",
packageName: "com.example.myapp",
@@ -104,11 +105,16 @@ class WindowsPlatform extends PlatformTarget
{
switch (System.hostArchitecture)
{
case ARMV6: defaults.architectures = [ARMV6];
case ARMV7: defaults.architectures = [ARMV7];
case X86: defaults.architectures = [X86];
case X64: defaults.architectures = [X64];
default: defaults.architectures = [];
case ARMV6:
defaults.architectures = [ARMV6];
case ARMV7:
defaults.architectures = [ARMV7];
case X86:
defaults.architectures = [X86];
case X64:
defaults.architectures = [X64];
default:
defaults.architectures = [];
}
}