Skip to content

Commit c194c79

Browse files
joshtynjalajoshtynjala
committed
add some missing type declarations on variables
1 parent 07159a2 commit c194c79

9 files changed

Lines changed: 35 additions & 30 deletions

File tree

‎scripts/Tools.hx‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ class Tools
325325
CLASS_PROPERTIES: classProperties
326326
};
327327
var template = new Template(templateData);
328-
var targetPath;
328+
var targetPath:String;
329329

330330
// if (project.target == IOS) {
331331

@@ -636,12 +636,7 @@ class Tools
636636
fileLabel = Path.normalize(file);
637637
}
638638

639-
Log.info("\x1b[1mProcessing file:\x1b[0m "
640-
+ fileLabel,
641-
" - \x1b[1mProcessing file:\x1b[0m "
642-
+ file
643-
+ " \x1b[3;37m->\x1b[0m "
644-
+ output);
639+
Log.info("\x1b[1mProcessing file:\x1b[0m " + fileLabel, " - \x1b[1mProcessing file:\x1b[0m " + file + " \x1b[3;37m->\x1b[0m " + output);
645640

646641
processFile(file, output, filePrefix, generate);
647642
}
@@ -1060,7 +1055,7 @@ class Tools
10601055

10611056
if (library.generate != false)
10621057
{
1063-
var targetPath;
1058+
var targetPath:String;
10641059

10651060
if (project.target == IOS)
10661061
{
@@ -1459,7 +1454,7 @@ class Tools
14591454
{
14601455
output.haxelibs.push(new Haxelib("swf"));
14611456

1462-
var generatedPath;
1457+
var generatedPath:String;
14631458

14641459
if (project.target == IOS)
14651460
{

‎src/swf/SWFTimelineContainer.hx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ class SWFTimelineContainer extends SWFEventDispatcher
531531
switch (soundStream.compression)
532532
{
533533
case SoundCompression.ADPCM: // ADPCM
534-
// TODO
534+
// TODO
535535
case SoundCompression.MP3: // MP3
536536
var numSamples:Int = soundData.readUnsignedShort();
537537
var seekSamples:Int = soundData.readShort();
@@ -583,7 +583,7 @@ class SWFTimelineContainer extends SWFEventDispatcher
583583
var ops = new Array();
584584
while (true)
585585
{
586-
var op;
586+
var op:Int;
587587
try
588588
op = i.readByte()
589589
catch (e:haxe.io.Eof)

‎src/swf/exporters/AnimateLibraryExporter.hx‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import swf.data.filters.IFilter;
88
import swf.data.SWFButtonRecord;
99
import swf.data.SWFSymbol;
1010
import swf.exporters.ShapeBitmapExporter;
11+
import swf.exporters.ShapeBitmapExporter.BitmapFill;
1112
import swf.exporters.ShapeCommandExporter;
1213
import swf.tags.IDefinitionTag;
1314
import swf.tags.TagDefineBits;
@@ -27,6 +28,7 @@ import swf.tags.TagDefineSprite;
2728
import swf.tags.TagDefineText;
2829
import swf.tags.TagPlaceObject;
2930
import swf.tags.TagSymbolClass;
31+
import swf.timeline.Frame;
3032
import swf.utils.SymbolUtils;
3133
import swf.SWFRoot;
3234
import swf.SWFTimelineContainer;
@@ -526,7 +528,8 @@ class AnimateLibraryExporter
526528

527529
var frame:Dynamic = {};
528530
frame.objects = [];
529-
var bitmap, frameObject:Dynamic;
531+
var bitmap:BitmapFill;
532+
var frameObject:Dynamic;
530533

531534
for (i in 0...bitmaps.length)
532535
{
@@ -669,10 +672,7 @@ class AnimateLibraryExporter
669672
var lastModified = new Map<Int, Int>();
670673
var zeroCharacter = -1;
671674

672-
var frame:Dynamic,
673-
frameObject:Dynamic,
674-
frameData,
675-
placeTag:TagPlaceObject;
675+
var frame:Dynamic, frameObject:Dynamic, frameData:Frame, placeTag:TagPlaceObject;
676676

677677
for (frameData in tag.frames)
678678
{
@@ -1404,7 +1404,18 @@ class AnimateLibraryExporter
14041404

14051405
case DropShadowFilter(distance, angle, color, alpha, blurX, blurY, strength, quality, inner, knockout, hideObject):
14061406
result.push([
1407-
SWFFilterType.DROP_SHADOW, distance, angle, color, alpha, blurX, blurY, strength, quality, inner, knockout, hideObject
1407+
SWFFilterType.DROP_SHADOW,
1408+
distance,
1409+
angle,
1410+
color,
1411+
alpha,
1412+
blurX,
1413+
blurY,
1414+
strength,
1415+
quality,
1416+
inner,
1417+
knockout,
1418+
hideObject
14081419
]);
14091420

14101421
case GlowFilter(color, alpha, blurX, blurY, strength, quality, inner, knockout):
@@ -1500,7 +1511,6 @@ private class SWFDocument
15001511

15011512
#if (haxe_ver < 4.0) @:enum #end
15021513
private #if (haxe_ver >= 4.0) enum #end abstract SWFFrameObjectType(Int) from Int to Int
1503-
15041514
{
15051515
public var CREATE = 0;
15061516
public var UPDATE = 1;
@@ -1509,7 +1519,6 @@ private #if (haxe_ver >= 4.0) enum #end abstract SWFFrameObjectType(Int) from In
15091519

15101520
#if (haxe_ver < 4.0) @:enum #end
15111521
private #if (haxe_ver >= 4.0) enum #end abstract SWFShapeCommandType(Int) from Int to Int
1512-
15131522
{
15141523
public var BEGIN_BITMAP_FILL = 0;
15151524
public var BEGIN_FILL = 1;
@@ -1524,7 +1533,6 @@ private #if (haxe_ver >= 4.0) enum #end abstract SWFShapeCommandType(Int) from I
15241533

15251534
#if (haxe_ver < 4.0) @:enum #end
15261535
private #if (haxe_ver >= 4.0) enum #end abstract SWFSymbolType(Int) from Int to Int
1527-
15281536
{
15291537
public var BITMAP = 0;
15301538
public var BUTTON = 1;
@@ -1537,7 +1545,6 @@ private #if (haxe_ver >= 4.0) enum #end abstract SWFSymbolType(Int) from Int to
15371545

15381546
#if (haxe_ver < 4.0) @:enum #end
15391547
private #if (haxe_ver >= 4.0) enum #end abstract SWFFilterType(Int) from Int to Int
1540-
15411548
{
15421549
public var BLUR = 0;
15431550
public var COLOR_MATRIX = 1;

‎src/swf/exporters/SWFLiteExporter.hx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import swf.data.consts.BlendMode;
1010
import swf.data.SWFButtonRecord;
1111
import swf.exporters.core.FilterType;
1212
import swf.exporters.core.ShapeCommand;
13+
import swf.exporters.ShapeBitmapExporter.BitmapFill;
1314
import swf.runtime.Bitmap;
1415
// #if hxp
1516
// import hxp.Log;
@@ -422,7 +423,8 @@ class SWFLiteExporter
422423
var symbol = new SpriteSymbol();
423424
var frame = new Frame();
424425
frame.objects = [];
425-
var bitmap, frameObject;
426+
var bitmap:BitmapFill;
427+
var frameObject:Dynamic;
426428

427429
for (i in 0...bitmaps.length)
428430
{

‎src/swf/exporters/animate/AnimateLibrary.hx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,9 @@ import openfl.filters.GlowFilter;
257257
var rootIndex = json.root;
258258
var symbolData:Array<Dynamic> = json.symbols;
259259

260-
var data, type:SWFSymbolType, symbol:AnimateSymbol = null;
261-
var bitmapSymbol, spriteSymbol;
260+
var data:Dynamic, type:SWFSymbolType, symbol:AnimateSymbol = null;
261+
var bitmapSymbol:AnimateBitmapSymbol;
262+
var spriteSymbol:AnimateSpriteSymbol;
262263

263264
symbols = new Map();
264265
symbolsByClassName = new Map();
@@ -807,7 +808,6 @@ import openfl.filters.GlowFilter;
807808
}
808809

809810
#if (haxe_ver >= 4.0) enum #else @:enum #end abstract SWFShapeCommandType(Int) from Int to Int
810-
811811
{
812812
public var BEGIN_BITMAP_FILL = 0;
813813
public var BEGIN_FILL = 1;
@@ -821,7 +821,6 @@ import openfl.filters.GlowFilter;
821821
}
822822

823823
#if (haxe_ver >= 4.0) enum #else @:enum #end abstract SWFSymbolType(Int) from Int to Int
824-
825824
{
826825
public var BITMAP = 0;
827826
public var BUTTON = 1;

‎src/swf/exporters/animate/AnimateStaticTextSymbol.hx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ class AnimateStaticTextSymbol extends AnimateSymbol
4848
var offsetX = matrix.tx;
4949
var offsetY = matrix.ty;
5050

51-
var scale, index;
51+
var scale:Float;
52+
var index:Int;
5253

5354
for (record in records)
5455
{

‎src/swf/exporters/animate/AnimateTimeline.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ class AnimateTimeline extends Timeline
285285
}
286286
else
287287
{
288-
var child;
288+
var child:DisplayObject;
289289
var i = currentInstances.length;
290290
var length = __sprite.numChildren;
291291

‎src/swf/exporters/swflite/StaticTextSymbol.hx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ class StaticTextSymbol extends SWFSymbol
4848
var offsetX = matrix.tx;
4949
var offsetY = matrix.ty;
5050

51-
var scale, index;
51+
var scale:Float;
52+
var index:Int;
5253

5354
for (record in records)
5455
{

‎src/swf/exporters/swflite/timeline/SymbolTimeline.hx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ class SymbolTimeline extends Timeline
376376
}
377377
}
378378

379-
var child;
379+
var child:DisplayObject;
380380
var i = currentInstances.length;
381381
var length = __movieClip.numChildren;
382382

0 commit comments

Comments
 (0)