Skip to content

Commit 3e3ce75

Browse files
author
Eric Lange
committed
Fixed some swift compiler warnings regarding nullability
Implemented some error-polyfill abstract functions
1 parent ea30600 commit 3e3ce75

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

LiquidCore/src/ios/LiquidCore/LCProcess.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@param process The node.js `LCProcess` object
3535
@param context The JavaScript `JSContext` for this process
3636
*/
37-
- (void) onProcessStart:(LCProcess*)process context:(JSContext*)context;
37+
- (void) onProcessStart:(LCProcess* _Nonnull)process context:(JSContext* _Nonnull)context;
3838

3939
/**
4040
Called when a node.js process has completed all of its callbacks and has nothing left
@@ -50,7 +50,7 @@
5050
@param exitCode The node.js exit code
5151
*/
5252

53-
- (void) onProcessAboutToExit:(LCProcess*)process exitCode:(int)code;
53+
- (void) onProcessAboutToExit:(LCProcess* _Nonnull)process exitCode:(int)code;
5454

5555
/**
5656
Called after a process has exited. The process is no longer active and cannot be used.
@@ -61,22 +61,22 @@
6161
@param process The defunct node.js `LCProcess` object
6262
@param exitCode The node.js exit code
6363
*/
64-
- (void) onProcessExit:(LCProcess*)process exitCode:(int)code;
64+
- (void) onProcessExit:(LCProcess* _Nonnull)process exitCode:(int)code;
6565

6666
/**
6767
Called in the event of an `LCProcess` failure
6868
6969
@param process The node.js `LCProcess` object
7070
@param exception The thrown exception
7171
*/
72-
- (void) onProcessFailed:(LCProcess*)process exception:(NSException*)exception;
72+
- (void) onProcessFailed:(LCProcess* _Nonnull)process exception:(NSException* _Nullable)exception;
7373
@end
7474

7575
/**
7676
A callback block to execute synchronous or asynchronous JavaScript on a node
7777
process thread.
7878
*/
79-
typedef void (^ProcessThreadBlock)(JSContext*);
79+
typedef void (^ProcessThreadBlock)(JSContext* _Nonnull);
8080

8181
/**
8282
Determines the scope of an uninstallation. A Local uninstallation will only clear
@@ -134,17 +134,17 @@ MediaAccessMask;
134134
/**
135135
The real path of the `/home/module` alias for this process.
136136
*/
137-
@property (nonatomic, readonly, copy) NSString* modulePath;
137+
@property (nonatomic, readonly, copy) NSString* _Nonnull modulePath;
138138

139139
/**
140140
The real path of the `/home/node_modules` path for this process.
141141
*/
142-
@property (nonatomic, readonly, copy) NSString* node_modulesPath;
142+
@property (nonatomic, readonly, copy) NSString* _Nonnull node_modulesPath;
143143

144144
/**
145145
The JavaScript context in which this process runs
146146
*/
147-
@property (atomic, readonly) JSContext* context;
147+
@property (atomic, readonly) JSContext* _Nullable context;
148148

149149
/**
150150
Creates a node.js process and attaches a delegate
@@ -155,20 +155,20 @@ MediaAccessMask;
155155
@param mediaAccessMask Permission mask for read/write access to external media.
156156
*/
157157
- (id) initWithDelegate:(id<LCProcessDelegate>)delegate
158-
id:(NSString*)uniqueID
158+
id:(NSString* _Nonnull)uniqueID
159159
mediaAccessMask:(MediaAccessMask)mediaAccessMask;
160160

161161
/**
162162
Adds an `LCProcessDelegate` to this process
163163
@param delegate the new delegate
164164
*/
165-
- (void) addDelegate:(id<LCProcessDelegate>)delegate;
165+
- (void) addDelegate:(id<LCProcessDelegate> _Nonnull)delegate;
166166

167167
/**
168168
Removes a delegate from this process
169169
@param delegate the delegate to remove
170170
*/
171-
- (void) removeDelegate:(id<LCProcessDelegate>)delegate;
171+
- (void) removeDelegate:(id<LCProcessDelegate> _Nonnull)delegate;
172172

173173
/**
174174
Determines if the process is currently active. If it is inactive, either it hasn't
@@ -225,6 +225,6 @@ MediaAccessMask;
225225
@param uniqueID The id of the process class
226226
@param scope scope in which to uninstall the process class
227227
*/
228-
+ (void) uninstall:(NSString*)uniqueID scope:(UninstallScope)scope;
228+
+ (void) uninstall:(NSString* _Nonnull)uniqueID scope:(UninstallScope)scope;
229229

230230
@end

LiquidCore/src/ios/V82JSC/polyfill/error-polyfill.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,14 +317,14 @@ class Frame {
317317
getTypeName() { abstractMethod() }
318318
getFunction() { return this.functionValue; }
319319
getFunctionName() { return this.functionName; }
320-
getMethodName() { abstractMethod() }
320+
getMethodName() { return this.functionName; }
321321
getFileName() { return this.fileName; }
322322
getLineNumber() { return this.lineNumber; }
323323
getColumnNumber() { return this.columnNumber; }
324-
getEvalOrigin() { abstractMethod() }
324+
getEvalOrigin() { return false; }
325325
isTopLevel() { abstractMethod() }
326-
isEval() { abstractMethod() }
327-
isNative() { abstractMethod() }
326+
isEval() { return false; }
327+
isNative() { return false; }
328328
isConstructor() { abstractMethod() }
329329
};
330330

0 commit comments

Comments
 (0)