firefly-compiler 0.5.5 → 0.5.7

package/compiler/Parser.ff

@@ -1135,8 +1135,8 @@ extend self: Parser {
     }
 
     parseUnary(): Term {
-        if(self.current().is(LOperator)) {
-            let token = self.skip(LOperator)
+        if(self.current().is2(LUnary, LOperator)) {
+            let token = if(self.current().is(LUnary)) {self.skip(LUnary)} else {self.skip(LOperator)}
             let term = self.parseUnary()
             let effect = self.freshUnificationVariable(token.at())
             let target = DynamicCall(EVariable(token.at(), token.raw()), False)
@@ -1152,7 +1152,7 @@ extend self: Parser {
             True
         } else {False}
         mutable result = self.parseAtom()
-        while {self.current().is4(LBracketLeft, LColon, LDot, LArrowThin) || self.current().rawIs2("!", "?")} {
+        while {self.current().is5(LBracketLeft, LColon, LDot, LArrowThin, LUnary)} {
             if(self.current().is(LDot)) {
                 self.skip(LDot)
                 if(self.current().rawIs("{")) {
@@ -1167,14 +1167,14 @@ extend self: Parser {
                 }
             } elseIf {self.current().is(LArrowThin)} {
                 result = self.parseDynamicMember(result)
-            } elseIf {self.current().rawIs2("!", "?")} {
-                let token = self.skip(LOperator)
+            } elseIf {self.current().is(LUnary)} {
+                let token = self.skip(LUnary)
                 let method = if(token.rawIs("!")) {"ff:core/UnsafeJs.value"} else {"ff:core/UnsafeJs.fromValue"}
                 let target = DynamicCall(EVariable(token.at(), method), False)
                 let effect = self.freshUnificationVariable(token.at())
-                result = self.parseDynamicMember(ECall(token.at(), target, effect, [], [
+                result = ECall(token.at(), target, effect, [], [
                     Argument(result.at, None, result)
-                ], []))
+                ], [])
             } else {
                 let at = self.current().at()
                 let typeArguments = if(!self.current().rawIs("[")) {[]} else {self.parseTypeArguments()}

package/compiler/Token.ff

@@ -42,6 +42,10 @@ extend token: Token {
         token.kind == kind1 || token.kind == kind2 || token.kind == kind3 || token.kind == kind4
     }
 
+    is5(kind1: TokenKind, kind2: TokenKind, kind3: TokenKind, kind4: TokenKind, kind5: TokenKind): Bool {
+        token.kind == kind1 || token.kind == kind2 || token.kind == kind3 || token.kind == kind4 || token.kind == kind5
+    }
+
     rawIs(value: String): Bool {
         token.stopOffset - token.startOffset == value.size() &&
         token.code.startsWith(value, token.startOffset)
@@ -75,6 +79,7 @@ data TokenKind {
     LBracketLeft
     LBracketRight
     LOperator
+    LUnary
     LComma
     LSeparator
     LDot
@@ -105,6 +110,7 @@ extend self: TokenKind {
             | LWildcard => True
             | LBracketLeft => False
             | LBracketRight => True
+            | LUnary => True
             | LOperator => False
             | LComma => False
             | LSeparator => False
@@ -135,6 +141,7 @@ extend self: TokenKind {
             | LWildcard => True
             | LBracketLeft => True
             | LBracketRight => False
+            | LUnary => True
             | LOperator => False
             | LComma => False
             | LSeparator => False
@@ -165,6 +172,7 @@ extend self: TokenKind {
             | LWildcard => True
             | LBracketLeft => False
             | LBracketRight => False
+            | LUnary => False
             | LOperator => False
             | LComma => False
             | LSeparator => False

package/compiler/Tokenizer.ff

@@ -205,12 +205,12 @@ tokenize(file: String, code: String, completionAt: Option[Location], attemptFixe
                 emitToken(LComma, start, i)
 
             } elseIf {
-                (code.grab(i) == '!' || code.grab(i) == '?') && i + 1 < code.size() && 
-                (code.grab(i + 1) == '.' || code.grab(i + 1) == '-')
+                code.grab(i) == '?' || 
+                (code.grab(i) == '!' && (i + 1 >= code.size() || code.grab(i + 1) != '='))
             } {
                 
                 i += 1
-                emitToken(LOperator, start, i)
+                emitToken(LUnary, start, i)
                 
             } elseIf {operatorCharacters.contains(code.grab(i))} {
 

package/core/List.ff

@@ -364,7 +364,7 @@ extend self[T]: List[T] {
         }
         array.drain()
     }
-
+    
 }
 
 extend self[T: Order]: List[T] {

package/output/js/ff/compiler/Parser.mjs

@@ -1488,8 +1488,10 @@ return result_
 }
 
 export function Parser_parseUnary(self_) {
-if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LOperator())) {
-const token_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LOperator());
+if(ff_compiler_Token.Token_is2(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LUnary(), ff_compiler_Token.LOperator())) {
+const token_ = (ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LUnary())
+? ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LUnary())
+: ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LOperator()));
 const term_ = ff_compiler_Parser.Parser_parseUnary(self_);
 const effect_ = ff_compiler_Parser.Parser_freshUnificationVariable(self_, ff_compiler_Token.Token_at(token_));
 const target_ = ff_compiler_Syntax.DynamicCall(ff_compiler_Syntax.EVariable(ff_compiler_Token.Token_at(token_), ff_compiler_Token.Token_raw(token_)), false);
@@ -1507,7 +1509,7 @@ return true
 })()
 : false);
 let result_ = ff_compiler_Parser.Parser_parseAtom(self_);
-while((ff_compiler_Token.Token_is4(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketLeft(), ff_compiler_Token.LColon(), ff_compiler_Token.LDot(), ff_compiler_Token.LArrowThin()) || ff_compiler_Token.Token_rawIs2(ff_compiler_Parser.Parser_current(self_), "!", "?"))) {
+while(ff_compiler_Token.Token_is5(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketLeft(), ff_compiler_Token.LColon(), ff_compiler_Token.LDot(), ff_compiler_Token.LArrowThin(), ff_compiler_Token.LUnary())) {
 if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LDot())) {
 ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LDot());
 if(ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "{")) {
@@ -1522,14 +1524,14 @@ result_ = ff_compiler_Syntax.EField(ff_compiler_Token.Token_at(token_), false, r
 }
 } else if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LArrowThin())) {
 result_ = ff_compiler_Parser.Parser_parseDynamicMember(self_, result_)
-} else if(ff_compiler_Token.Token_rawIs2(ff_compiler_Parser.Parser_current(self_), "!", "?")) {
-const token_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LOperator());
+} else if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LUnary())) {
+const token_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LUnary());
 const method_ = (ff_compiler_Token.Token_rawIs(token_, "!")
 ? "ff:core/UnsafeJs.value"
 : "ff:core/UnsafeJs.fromValue");
 const target_ = ff_compiler_Syntax.DynamicCall(ff_compiler_Syntax.EVariable(ff_compiler_Token.Token_at(token_), method_), false);
 const effect_ = ff_compiler_Parser.Parser_freshUnificationVariable(self_, ff_compiler_Token.Token_at(token_));
-result_ = ff_compiler_Parser.Parser_parseDynamicMember(self_, ff_compiler_Syntax.ECall(ff_compiler_Token.Token_at(token_), target_, effect_, [], [ff_compiler_Syntax.Argument(result_.at_, ff_core_Option.None(), result_)], []))
+result_ = ff_compiler_Syntax.ECall(ff_compiler_Token.Token_at(token_), target_, effect_, [], [ff_compiler_Syntax.Argument(result_.at_, ff_core_Option.None(), result_)], [])
 } else {
 const at_ = ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_));
 const typeArguments_ = ((!ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "["))
@@ -3106,8 +3108,10 @@ return result_
 }
 
 export async function Parser_parseUnary$(self_, $task) {
-if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LOperator())) {
-const token_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LOperator());
+if(ff_compiler_Token.Token_is2(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LUnary(), ff_compiler_Token.LOperator())) {
+const token_ = (ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LUnary())
+? ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LUnary())
+: ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LOperator()));
 const term_ = ff_compiler_Parser.Parser_parseUnary(self_);
 const effect_ = ff_compiler_Parser.Parser_freshUnificationVariable(self_, ff_compiler_Token.Token_at(token_));
 const target_ = ff_compiler_Syntax.DynamicCall(ff_compiler_Syntax.EVariable(ff_compiler_Token.Token_at(token_), ff_compiler_Token.Token_raw(token_)), false);
@@ -3125,7 +3129,7 @@ return true
 })())
 : false);
 let result_ = ff_compiler_Parser.Parser_parseAtom(self_);
-while((ff_compiler_Token.Token_is4(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketLeft(), ff_compiler_Token.LColon(), ff_compiler_Token.LDot(), ff_compiler_Token.LArrowThin()) || ff_compiler_Token.Token_rawIs2(ff_compiler_Parser.Parser_current(self_), "!", "?"))) {
+while(ff_compiler_Token.Token_is5(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LBracketLeft(), ff_compiler_Token.LColon(), ff_compiler_Token.LDot(), ff_compiler_Token.LArrowThin(), ff_compiler_Token.LUnary())) {
 if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LDot())) {
 ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LDot());
 if(ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "{")) {
@@ -3140,14 +3144,14 @@ result_ = ff_compiler_Syntax.EField(ff_compiler_Token.Token_at(token_), false, r
 }
 } else if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LArrowThin())) {
 result_ = ff_compiler_Parser.Parser_parseDynamicMember(self_, result_)
-} else if(ff_compiler_Token.Token_rawIs2(ff_compiler_Parser.Parser_current(self_), "!", "?")) {
-const token_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LOperator());
+} else if(ff_compiler_Token.Token_is(ff_compiler_Parser.Parser_current(self_), ff_compiler_Token.LUnary())) {
+const token_ = ff_compiler_Parser.Parser_skip(self_, ff_compiler_Token.LUnary());
 const method_ = (ff_compiler_Token.Token_rawIs(token_, "!")
 ? "ff:core/UnsafeJs.value"
 : "ff:core/UnsafeJs.fromValue");
 const target_ = ff_compiler_Syntax.DynamicCall(ff_compiler_Syntax.EVariable(ff_compiler_Token.Token_at(token_), method_), false);
 const effect_ = ff_compiler_Parser.Parser_freshUnificationVariable(self_, ff_compiler_Token.Token_at(token_));
-result_ = ff_compiler_Parser.Parser_parseDynamicMember(self_, ff_compiler_Syntax.ECall(ff_compiler_Token.Token_at(token_), target_, effect_, [], [ff_compiler_Syntax.Argument(result_.at_, ff_core_Option.None(), result_)], []))
+result_ = ff_compiler_Syntax.ECall(ff_compiler_Token.Token_at(token_), target_, effect_, [], [ff_compiler_Syntax.Argument(result_.at_, ff_core_Option.None(), result_)], [])
 } else {
 const at_ = ff_compiler_Token.Token_at(ff_compiler_Parser.Parser_current(self_));
 const typeArguments_ = ((!ff_compiler_Token.Token_rawIs(ff_compiler_Parser.Parser_current(self_), "["))

package/output/js/ff/compiler/Token.mjs

@@ -154,6 +154,10 @@ const LOperator$ = {LOperator: true};
 export function LOperator() {
 return LOperator$;
 }
+const LUnary$ = {LUnary: true};
+export function LUnary() {
+return LUnary$;
+}
 const LComma$ = {LComma: true};
 export function LComma() {
 return LComma$;
@@ -237,6 +241,10 @@ export function Token_is4(token_, kind1_, kind2_, kind3_, kind4_) {
 return (((ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind1_) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind2_)) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind3_)) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind4_))
 }
 
+export function Token_is5(token_, kind1_, kind2_, kind3_, kind4_, kind5_) {
+return ((((ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind1_) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind2_)) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind3_)) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind4_)) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind5_))
+}
+
 export function Token_rawIs(token_, value_) {
 return (((token_.stopOffset_ - token_.startOffset_) === ff_core_String.String_size(value_)) && ff_core_String.String_startsWith(token_.code_, value_, token_.startOffset_))
 }
@@ -281,6 +289,10 @@ export async function Token_is4$(token_, kind1_, kind2_, kind3_, kind4_, $task)
 return (((ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind1_) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind2_)) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind3_)) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind4_))
 }
 
+export async function Token_is5$(token_, kind1_, kind2_, kind3_, kind4_, kind5_, $task) {
+return ((((ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind1_) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind2_)) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind3_)) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind4_)) || ff_compiler_Token.ff_core_Equal_Equal$ff_compiler_Token_TokenKind.equals_(token_.kind_, kind5_))
+}
+
 export async function Token_rawIs$(token_, value_, $task) {
 return (((token_.stopOffset_ - token_.startOffset_) === ff_core_String.String_size(value_)) && ff_core_String.String_startsWith(token_.code_, value_, token_.startOffset_))
 }
@@ -336,6 +348,9 @@ return false
 if(_1.LBracketRight) {
 return true
 }
+if(_1.LUnary) {
+return true
+}
 if(_1.LOperator) {
 return false
 }
@@ -417,6 +432,9 @@ return true
 if(_1.LBracketRight) {
 return false
 }
+if(_1.LUnary) {
+return true
+}
 if(_1.LOperator) {
 return false
 }
@@ -498,6 +516,9 @@ return false
 if(_1.LBracketRight) {
 return false
 }
+if(_1.LUnary) {
+return false
+}
 if(_1.LOperator) {
 return false
 }
@@ -579,6 +600,9 @@ return false
 if(_1.LBracketRight) {
 return true
 }
+if(_1.LUnary) {
+return true
+}
 if(_1.LOperator) {
 return false
 }
@@ -660,6 +684,9 @@ return true
 if(_1.LBracketRight) {
 return false
 }
+if(_1.LUnary) {
+return true
+}
 if(_1.LOperator) {
 return false
 }
@@ -741,6 +768,9 @@ return false
 if(_1.LBracketRight) {
 return false
 }
+if(_1.LUnary) {
+return false
+}
 if(_1.LOperator) {
 return false
 }
@@ -873,6 +903,10 @@ if(value_a.LOperator) {
 const z_ = value_a;
 return "LOperator"
 }
+if(value_a.LUnary) {
+const z_ = value_a;
+return "LUnary"
+}
 if(value_a.LComma) {
 const z_ = value_a;
 return "LComma"
@@ -976,6 +1010,10 @@ if(value_a.LOperator) {
 const z_ = value_a;
 return "LOperator"
 }
+if(value_a.LUnary) {
+const z_ = value_a;
+return "LUnary"
+}
 if(value_a.LComma) {
 const z_ = value_a;
 return "LComma"
@@ -1237,42 +1275,45 @@ return 11
 if(z_a.LOperator) {
 return 12
 }
-if(z_a.LComma) {
+if(z_a.LUnary) {
 return 13
 }
-if(z_a.LSeparator) {
+if(z_a.LComma) {
 return 14
 }
-if(z_a.LDot) {
+if(z_a.LSeparator) {
 return 15
 }
-if(z_a.LSemicolon) {
+if(z_a.LDot) {
 return 16
 }
-if(z_a.LPipe) {
+if(z_a.LSemicolon) {
 return 17
 }
-if(z_a.LColon) {
+if(z_a.LPipe) {
 return 18
 }
-if(z_a.LDotDotDot) {
+if(z_a.LColon) {
 return 19
 }
-if(z_a.LArrowThin) {
+if(z_a.LDotDotDot) {
 return 20
 }
-if(z_a.LArrowThick) {
+if(z_a.LArrowThin) {
 return 21
 }
-if(z_a.LAssign) {
+if(z_a.LArrowThick) {
 return 22
 }
-if(z_a.LAssignPlus) {
+if(z_a.LAssign) {
 return 23
 }
-if(z_a.LAssignMinus) {
+if(z_a.LAssignPlus) {
 return 24
 }
+if(z_a.LAssignMinus) {
+return 25
+}
 }
 return ff_core_Ordering.ff_core_Ordering_Order$ff_core_Int_Int.compare_(number_(x_), number_(y_))
 }
@@ -1325,42 +1366,45 @@ return 11
 if(z_a.LOperator) {
 return 12
 }
-if(z_a.LComma) {
+if(z_a.LUnary) {
 return 13
 }
-if(z_a.LSeparator) {
+if(z_a.LComma) {
 return 14
 }
-if(z_a.LDot) {
+if(z_a.LSeparator) {
 return 15
 }
-if(z_a.LSemicolon) {
+if(z_a.LDot) {
 return 16
 }
-if(z_a.LPipe) {
+if(z_a.LSemicolon) {
 return 17
 }
-if(z_a.LColon) {
+if(z_a.LPipe) {
 return 18
 }
-if(z_a.LDotDotDot) {
+if(z_a.LColon) {
 return 19
 }
-if(z_a.LArrowThin) {
+if(z_a.LDotDotDot) {
 return 20
 }
-if(z_a.LArrowThick) {
+if(z_a.LArrowThin) {
 return 21
 }
-if(z_a.LAssign) {
+if(z_a.LArrowThick) {
 return 22
 }
-if(z_a.LAssignPlus) {
+if(z_a.LAssign) {
 return 23
 }
-if(z_a.LAssignMinus) {
+if(z_a.LAssignPlus) {
 return 24
 }
+if(z_a.LAssignMinus) {
+return 25
+}
 }
 return ff_core_Ordering.ff_core_Ordering_Order$ff_core_Int_Int.compare_(number_(x_), number_(y_))
 }
@@ -1548,7 +1592,7 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 1
 serialization_.offset_ += 1
 return
 }
-if(value_a.LComma) {
+if(value_a.LUnary) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -1556,11 +1600,19 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 1
 serialization_.offset_ += 1
 return
 }
+if(value_a.LComma) {
+const v_ = value_a;
+serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
+ff_core_Serializable.Serialization_autoResize(serialization_, 1);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 14);
+serialization_.offset_ += 1
+return
+}
 if(value_a.LSeparator) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 14);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 15);
 serialization_.offset_ += 1
 return
 }
@@ -1568,7 +1620,7 @@ if(value_a.LDot) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 22), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 15);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 16);
 serialization_.offset_ += 1
 return
 }
@@ -1576,7 +1628,7 @@ if(value_a.LSemicolon) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 16);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 17);
 serialization_.offset_ += 1
 return
 }
@@ -1584,7 +1636,7 @@ if(value_a.LPipe) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 23), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 17);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 18);
 serialization_.offset_ += 1
 return
 }
@@ -1592,7 +1644,7 @@ if(value_a.LColon) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 18);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 19);
 serialization_.offset_ += 1
 return
 }
@@ -1600,7 +1652,7 @@ if(value_a.LDotDotDot) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 19);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 20);
 serialization_.offset_ += 1
 return
 }
@@ -1608,7 +1660,7 @@ if(value_a.LArrowThin) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 20);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 21);
 serialization_.offset_ += 1
 return
 }
@@ -1616,7 +1668,7 @@ if(value_a.LArrowThick) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 21);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 22);
 serialization_.offset_ += 1
 return
 }
@@ -1624,7 +1676,7 @@ if(value_a.LAssign) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 25), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 22);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 23);
 serialization_.offset_ += 1
 return
 }
@@ -1632,7 +1684,7 @@ if(value_a.LAssignPlus) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 23);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 24);
 serialization_.offset_ += 1
 return
 }
@@ -1640,7 +1692,7 @@ if(value_a.LAssignMinus) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 30), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 24);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 25);
 serialization_.offset_ += 1
 return
 }
@@ -1704,49 +1756,53 @@ return ff_compiler_Token.LOperator()
 }
 if(_1 === 13) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
-return ff_compiler_Token.LComma()
+return ff_compiler_Token.LUnary()
 }
 if(_1 === 14) {
+serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
+return ff_compiler_Token.LComma()
+}
+if(_1 === 15) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 return ff_compiler_Token.LSeparator()
 }
-if(_1 === 15) {
+if(_1 === 16) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 22), 0);
 return ff_compiler_Token.LDot()
 }
-if(_1 === 16) {
+if(_1 === 17) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 return ff_compiler_Token.LSemicolon()
 }
-if(_1 === 17) {
+if(_1 === 18) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 23), 0);
 return ff_compiler_Token.LPipe()
 }
-if(_1 === 18) {
+if(_1 === 19) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
 return ff_compiler_Token.LColon()
 }
-if(_1 === 19) {
+if(_1 === 20) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 return ff_compiler_Token.LDotDotDot()
 }
-if(_1 === 20) {
+if(_1 === 21) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 return ff_compiler_Token.LArrowThin()
 }
-if(_1 === 21) {
+if(_1 === 22) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 return ff_compiler_Token.LArrowThick()
 }
-if(_1 === 22) {
+if(_1 === 23) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 25), 0);
 return ff_compiler_Token.LAssign()
 }
-if(_1 === 23) {
+if(_1 === 24) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 return ff_compiler_Token.LAssignPlus()
 }
-if(_1 === 24) {
+if(_1 === 25) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 30), 0);
 return ff_compiler_Token.LAssignMinus()
 }
@@ -1862,7 +1918,7 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 1
 serialization_.offset_ += 1
 return
 }
-if(value_a.LComma) {
+if(value_a.LUnary) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
@@ -1870,11 +1926,19 @@ ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 1
 serialization_.offset_ += 1
 return
 }
+if(value_a.LComma) {
+const v_ = value_a;
+serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
+ff_core_Serializable.Serialization_autoResize(serialization_, 1);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 14);
+serialization_.offset_ += 1
+return
+}
 if(value_a.LSeparator) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 14);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 15);
 serialization_.offset_ += 1
 return
 }
@@ -1882,7 +1946,7 @@ if(value_a.LDot) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 22), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 15);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 16);
 serialization_.offset_ += 1
 return
 }
@@ -1890,7 +1954,7 @@ if(value_a.LSemicolon) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 16);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 17);
 serialization_.offset_ += 1
 return
 }
@@ -1898,7 +1962,7 @@ if(value_a.LPipe) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 23), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 17);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 18);
 serialization_.offset_ += 1
 return
 }
@@ -1906,7 +1970,7 @@ if(value_a.LColon) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 18);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 19);
 serialization_.offset_ += 1
 return
 }
@@ -1914,7 +1978,7 @@ if(value_a.LDotDotDot) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 19);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 20);
 serialization_.offset_ += 1
 return
 }
@@ -1922,7 +1986,7 @@ if(value_a.LArrowThin) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 20);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 21);
 serialization_.offset_ += 1
 return
 }
@@ -1930,7 +1994,7 @@ if(value_a.LArrowThick) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 21);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 22);
 serialization_.offset_ += 1
 return
 }
@@ -1938,7 +2002,7 @@ if(value_a.LAssign) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 25), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 22);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 23);
 serialization_.offset_ += 1
 return
 }
@@ -1946,7 +2010,7 @@ if(value_a.LAssignPlus) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 23);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 24);
 serialization_.offset_ += 1
 return
 }
@@ -1954,7 +2018,7 @@ if(value_a.LAssignMinus) {
 const v_ = value_a;
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 30), 0);
 ff_core_Serializable.Serialization_autoResize(serialization_, 1);
-ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 24);
+ff_core_Buffer.Buffer_setUint8(serialization_.buffer_, serialization_.offset_, 25);
 serialization_.offset_ += 1
 return
 }
@@ -2018,49 +2082,53 @@ return ff_compiler_Token.LOperator()
 }
 if(_1 === 13) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
-return ff_compiler_Token.LComma()
+return ff_compiler_Token.LUnary()
 }
 if(_1 === 14) {
+serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
+return ff_compiler_Token.LComma()
+}
+if(_1 === 15) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 return ff_compiler_Token.LSeparator()
 }
-if(_1 === 15) {
+if(_1 === 16) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 22), 0);
 return ff_compiler_Token.LDot()
 }
-if(_1 === 16) {
+if(_1 === 17) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 return ff_compiler_Token.LSemicolon()
 }
-if(_1 === 17) {
+if(_1 === 18) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 23), 0);
 return ff_compiler_Token.LPipe()
 }
-if(_1 === 18) {
+if(_1 === 19) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 24), 0);
 return ff_compiler_Token.LColon()
 }
-if(_1 === 19) {
+if(_1 === 20) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 return ff_compiler_Token.LDotDotDot()
 }
-if(_1 === 20) {
+if(_1 === 21) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 28), 0);
 return ff_compiler_Token.LArrowThin()
 }
-if(_1 === 21) {
+if(_1 === 22) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 return ff_compiler_Token.LArrowThick()
 }
-if(_1 === 22) {
+if(_1 === 23) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 25), 0);
 return ff_compiler_Token.LAssign()
 }
-if(_1 === 23) {
+if(_1 === 24) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 29), 0);
 return ff_compiler_Token.LAssignPlus()
 }
-if(_1 === 24) {
+if(_1 === 25) {
 serialization_.checksum_ = ff_core_Int.Int_bitOr(((31 * serialization_.checksum_) + 30), 0);
 return ff_compiler_Token.LAssignMinus()
 }

package/output/js/ff/compiler/Tokenizer.mjs

@@ -280,9 +280,9 @@ emitToken_(ff_compiler_Token.LWildcard(), start_, i_)
 } else if((ff_core_String.String_grab(code_, i_) === 44)) {
 i_ += 1;
 emitToken_(ff_compiler_Token.LComma(), start_, i_)
-} else if(((((ff_core_String.String_grab(code_, i_) === 33) || (ff_core_String.String_grab(code_, i_) === 63)) && ((i_ + 1) < ff_core_String.String_size(code_))) && ((ff_core_String.String_grab(code_, (i_ + 1)) === 46) || (ff_core_String.String_grab(code_, (i_ + 1)) === 45)))) {
+} else if(((ff_core_String.String_grab(code_, i_) === 63) || ((ff_core_String.String_grab(code_, i_) === 33) && (((i_ + 1) >= ff_core_String.String_size(code_)) || (ff_core_String.String_grab(code_, (i_ + 1)) !== 61))))) {
 i_ += 1;
-emitToken_(ff_compiler_Token.LOperator(), start_, i_)
+emitToken_(ff_compiler_Token.LUnary(), start_, i_)
 } else if(ff_core_Set.Set_contains(operatorCharacters_, ff_core_String.String_grab(code_, i_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_Char_Char)) {
 i_ += 1;
 if(((((ff_core_String.String_grab(code_, (i_ - 1)) === 46) && ((i_ + 1) < ff_core_String.String_size(code_))) && (ff_core_String.String_grab(code_, i_) === 46)) && (ff_core_String.String_grab(code_, (i_ + 1)) !== 46))) {
@@ -527,9 +527,9 @@ emitToken_(ff_compiler_Token.LWildcard(), start_, i_)
 } else if((ff_core_String.String_grab(code_, i_) === 44)) {
 i_ += 1;
 emitToken_(ff_compiler_Token.LComma(), start_, i_)
-} else if(((((ff_core_String.String_grab(code_, i_) === 33) || (ff_core_String.String_grab(code_, i_) === 63)) && ((i_ + 1) < ff_core_String.String_size(code_))) && ((ff_core_String.String_grab(code_, (i_ + 1)) === 46) || (ff_core_String.String_grab(code_, (i_ + 1)) === 45)))) {
+} else if(((ff_core_String.String_grab(code_, i_) === 63) || ((ff_core_String.String_grab(code_, i_) === 33) && (((i_ + 1) >= ff_core_String.String_size(code_)) || (ff_core_String.String_grab(code_, (i_ + 1)) !== 61))))) {
 i_ += 1;
-emitToken_(ff_compiler_Token.LOperator(), start_, i_)
+emitToken_(ff_compiler_Token.LUnary(), start_, i_)
 } else if(ff_core_Set.Set_contains(operatorCharacters_, ff_core_String.String_grab(code_, i_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_Char_Char)) {
 i_ += 1;
 if(((((ff_core_String.String_grab(code_, (i_ - 1)) === 46) && ((i_ + 1) < ff_core_String.String_size(code_))) && (ff_core_String.String_grab(code_, i_) === 46)) && (ff_core_String.String_grab(code_, (i_ + 1)) !== 46))) {

package/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly compiler",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.5",
+    "version": "0.5.7",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"

package/vscode/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly language support",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.5",
+    "version": "0.5.7",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"