Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
3fef0d1
Initial removal of old script engine
joemcbride Mar 24, 2017
a60ad76
Remove old tokens
joemcbride Mar 24, 2017
8dd785a
Basic script loading
joemcbride Mar 24, 2017
531b78d
Remove old tests
joemcbride Mar 24, 2017
72d917a
Update frameworks, Add SwiftParsec
joemcbride Mar 25, 2017
d25f98d
Blah
joemcbride Mar 27, 2017
34ca663
Initial Swift 3.0
joemcbride Mar 27, 2017
a214d00
Fix tests
joemcbride Mar 28, 2017
5b9533f
Maps working again
joemcbride Mar 29, 2017
ec228c2
Remove old html parser
joemcbride Mar 29, 2017
7d8d98a
Basic script handling
joemcbride Apr 1, 2017
aa4f99f
Add abort/pause/resume, goto
joemcbride Apr 1, 2017
a596151
Clean up goto label
joemcbride Apr 1, 2017
7095fa5
Parse several more commands
joemcbride Apr 2, 2017
821e168
Handle data stream/parse
joemcbride Apr 4, 2017
48f1dcf
Ignore case on commands
joemcbride Apr 5, 2017
6b946af
Parse single line if_X
joemcbride Apr 5, 2017
1ff4ac6
Parse var/setvariable
joemcbride Apr 5, 2017
79a6470
Bunch more commands
joemcbride Apr 6, 2017
b80e779
Add stack tracing
joemcbride Apr 6, 2017
fab7827
Base if/else if/else
joemcbride Apr 8, 2017
1ba656a
Tests for Script
joemcbride Apr 8, 2017
b1fa6d2
Else if and else working
joemcbride Apr 11, 2017
93ee196
Few more if/elseif/else tests
joemcbride Apr 11, 2017
c0fbd00
match/matchre/matchwait, variables
joemcbride Apr 12, 2017
b72c108
Gosub
joemcbride Apr 13, 2017
9578f06
WaitEval, function expressions
joemcbride Apr 19, 2017
a2dc2ad
List of function names
joemcbride Apr 19, 2017
9632135
Evaluate functions
joemcbride Apr 20, 2017
62ea0f2
Actions
joemcbride Apr 20, 2017
c1b598f
Math + random
joemcbride Apr 21, 2017
ec71f84
eval, evalMath
joemcbride Apr 21, 2017
a4221ae
Add ability to cancel delayed commands
joemcbride Apr 21, 2017
aad12bc
Fix consecutive ifs
joemcbride Apr 21, 2017
82a9892
Fix a few bugs
joemcbride Apr 22, 2017
4399c39
Few more bug fixes
joemcbride Apr 22, 2017
9ff9e49
Support indexed variables
joemcbride Apr 28, 2017
4af6427
Bump frameworks
joemcbride Apr 29, 2017
d380ffa
Add Scripts-PreRelease folder, bump version
joemcbride Apr 29, 2017
8d66a45
Fix a couple issues
joemcbride May 7, 2017
f3c92d1
Xcode 8.3.2
joemcbride Jun 2, 2017
0d0408a
Initial stream tokenizer
joemcbride Jun 3, 2017
c8c2a56
Stashing
joemcbride Apr 14, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ podfile.lock
gemfile.lock
xcuserdata
.idea
*.orig
9 changes: 4 additions & 5 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
github "shpakovski/MASShortcut" ~> 2.3.6
github "Squirrel/Squirrel.Mac" ~> 0.3.0
github "robbiehanson/CocoaAsyncSocket" ~> 7.5.1
github "joemcbride/GlimpseXML" "xcode8-swift2.3"
github "shpakovski/MASShortcut" == 2.3.6
github "Squirrel/Squirrel.Mac" == 0.3.0
github "robbiehanson/CocoaAsyncSocket" == 7.5.1
github "joemcbride/pegkit" "modules"
github "joemcbride/Oysterkit" "RTM"
github "tadija/AEXML"
4 changes: 2 additions & 2 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "Quick/Quick" ~> 0.9.3
github "Quick/Nimble" ~> 4.1.0
github "Quick/Quick" ~> 1.1.0
github "Quick/Nimble" ~> 6.1.0
1 change: 1 addition & 0 deletions carthage_update.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/sh

rm -rf ./Carthage/Build/Mac/
carthage update --platform osx

if [ $? -eq 0 ]
Expand Down
1 change: 1 addition & 0 deletions src/Frameworks/AEXML.framework/AEXML
Binary file added src/Frameworks/AEXML.framework/Versions/A/AEXML
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by Apple Swift version 2.3 (swiftlang-800.10.13 clang-800.0.42.1)
// Generated by Apple Swift version 3.1 (swiftlang-802.0.53 clang-802.0.42)
#pragma clang diagnostic push

#if defined(__has_include) && __has_include(<swift/objc-prologue.h>)
Expand Down Expand Up @@ -28,6 +28,9 @@ typedef double swift_double4 __attribute__((__ext_vector_type__(4)));
typedef int swift_int2 __attribute__((__ext_vector_type__(2)));
typedef int swift_int3 __attribute__((__ext_vector_type__(3)));
typedef int swift_int4 __attribute__((__ext_vector_type__(4)));
typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2)));
typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3)));
typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
#endif

#if !defined(SWIFT_PASTE)
Expand All @@ -37,6 +40,13 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4)));
#if !defined(SWIFT_METATYPE)
# define SWIFT_METATYPE(X) Class
#endif
#if !defined(SWIFT_CLASS_PROPERTY)
# if __has_feature(objc_class_property)
# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__
# else
# define SWIFT_CLASS_PROPERTY(...)
# endif
#endif

#if defined(__has_attribute) && __has_attribute(objc_runtime_name)
# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X)))
Expand All @@ -48,6 +58,21 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4)));
#else
# define SWIFT_COMPILE_NAME(X)
#endif
#if defined(__has_attribute) && __has_attribute(objc_method_family)
# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X)))
#else
# define SWIFT_METHOD_FAMILY(X)
#endif
#if defined(__has_attribute) && __has_attribute(noescape)
# define SWIFT_NOESCAPE __attribute__((noescape))
#else
# define SWIFT_NOESCAPE
#endif
#if defined(__has_attribute) && __has_attribute(warn_unused_result)
# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
#else
# define SWIFT_WARN_UNUSED_RESULT
#endif
#if !defined(SWIFT_CLASS_EXTRA)
# define SWIFT_CLASS_EXTRA
#endif
Expand Down Expand Up @@ -91,9 +116,42 @@ typedef int swift_int4 __attribute__((__ext_vector_type__(4)));
# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME) SWIFT_ENUM(_type, _name)
# endif
#endif
#if !defined(SWIFT_UNAVAILABLE)
# define SWIFT_UNAVAILABLE __attribute__((unavailable))
#endif
#if !defined(SWIFT_UNAVAILABLE_MSG)
# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg)))
#endif
#if !defined(SWIFT_AVAILABILITY)
# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
#endif
#if !defined(SWIFT_DEPRECATED)
# define SWIFT_DEPRECATED __attribute__((deprecated))
#endif
#if !defined(SWIFT_DEPRECATED_MSG)
# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__)))
#endif
#if defined(__has_feature) && __has_feature(modules)
@import ObjectiveC;
@import Foundation;
#endif

#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
#pragma clang diagnostic ignored "-Wduplicate-method-arg"
@class NSXMLParser;

/// Simple wrapper around <code>Foundation.XMLParser</code>.
SWIFT_CLASS("_TtC5AEXML11AEXMLParser")
@interface AEXMLParser : NSObject <NSXMLParserDelegate>
@property (nonatomic, readonly, copy) NSData * _Nonnull data;
@property (nonatomic, copy) NSString * _Nonnull currentValue;
@property (nonatomic) NSError * _Nullable parseError;
- (BOOL)parseAndReturnError:(NSError * _Nullable * _Nullable)error;
- (void)parser:(NSXMLParser * _Nonnull)parser didStartElement:(NSString * _Nonnull)elementName namespaceURI:(NSString * _Nullable)namespaceURI qualifiedName:(NSString * _Nullable)qName attributes:(NSDictionary<NSString *, NSString *> * _Nonnull)attributeDict;
- (void)parser:(NSXMLParser * _Nonnull)parser foundCharacters:(NSString * _Nonnull)string;
- (void)parser:(NSXMLParser * _Nonnull)parser didEndElement:(NSString * _Nonnull)elementName namespaceURI:(NSString * _Nullable)namespaceURI qualifiedName:(NSString * _Nullable)qName;
- (void)parser:(NSXMLParser * _Nonnull)parser parseErrorOccurred:(NSError * _Nonnull)parseError;
- (nonnull instancetype)init SWIFT_UNAVAILABLE;
@end

#pragma clang diagnostic pop
4 changes: 4 additions & 0 deletions src/Frameworks/AEXML.framework/Versions/A/Headers/AEXML.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#import <Foundation/Foundation.h>

FOUNDATION_EXPORT double AEXMLVersionNumber;
FOUNDATION_EXPORT const unsigned char AEXMLVersionString[];
Binary file not shown.
Binary file not shown.
10 changes: 10 additions & 0 deletions src/Frameworks/AEXML.framework/Versions/A/Modules/module.modulemap
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
framework module AEXML {
umbrella header "AEXML.h"

export *
module * { export * }
}

module AEXML.Swift {
header "AEXML-Swift.h"
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,47 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>16E195</string>
<string>16F73</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>GlimpseXML</string>
<string>AEXML</string>
<key>CFBundleIdentifier</key>
<string>io.glimpse.GlimpseXML</string>
<string>net.tadija.AEXML</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>GlimpseXML</string>
<string>AEXML</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.4</string>
<string>4.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string></string>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>8C1002</string>
<string>8E2002</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>16C58</string>
<string>16E185</string>
<key>DTSDKName</key>
<string>macosx10.12</string>
<key>DTXcode</key>
<string>0821</string>
<string>0832</string>
<key>DTXcodeBuild</key>
<string>8C1002</string>
<string>8E2002</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
<integer>2</integer>
</array>
</dict>
</plist>
Binary file not shown.
Loading