Support CfxLua #338

mdxwzl · 2025-02-09T02:25:07Z

Implemented CFX Lua as a feature flag - cfxlua
- Compound Operators: +=, -=, *=, /=, <<=, >>=, &=, |=, and ^=
- Safe Navigation e.g. t?.x?.y == nil
- In Unpacking e.g. local a, b, c = t is equivalent to local a, b, c = t.a, t.b, t.c
- Set Constructors e.g. t = { .x, .y } is equivalent to t = { x = true, y = true }
- C-Style Comments (single & multiline) e.g. /* comment */
- Compile Time Jenkins' Hashes e.g. `Hello, World!` -> 1395890823

mdxwzl · 2025-02-09T05:02:13Z

Some of the tests dont pass in the workflow, I'll look into it tmrw

mdxwzl · 2025-02-10T08:37:35Z

Would be glad if someone can look over it. I tested the workflows locally with Docker, and it keeps changing up the bytes, line & character values in the AST. Somehow, they are not the same in the workflow environment as on my Windows machine.

mdxwzl · 2025-02-20T05:54:49Z

Test should run now

JohnnyMorganz

Thanks for this! I had an initial look - I haven't looked deep into the parser / tokenizer changes yet, I will do this in a follow up

JohnnyMorganz · 2025-02-22T13:08:35Z

full-moon/src/ast/luau.rs

-}
+/*
+    CompoundOp and CompoundAssignment have been moved to `compound.rs´, since CfxLua makes use of them as well.
+*/


Can we re-export the types here? To reduce the breaking change on downstream users

JohnnyMorganz · 2025-02-22T13:09:25Z

full-moon/src/ast/compound.rs

+    SlashEqual(TokenReference),
+    CaretEqual(TokenReference),
+
+    // luau sepcific


Should these be gated via cfg(feature = "luau") flags if they are only available in luau?

Some with the below for CfxLua

JohnnyMorganz · 2025-02-22T13:11:37Z

full-moon/src/ast/compound.rs

+    LeftShift(TokenReference),
+    RightShift(TokenReference),
+    BitwiseAndAssignment(TokenReference),
+    BitwiseOrAssignment(TokenReference),


To align with the other options. We try to make the names represent the characters rather than the logic, since in future >>= could mean something other than right shift operator for a different Lua dialect

Suggested change

LeftShift(TokenReference),

RightShift(TokenReference),

BitwiseAndAssignment(TokenReference),

BitwiseOrAssignment(TokenReference),

DoubleLessThanEqual(TokenReference),

DoubleGreaterThanEqual(TokenReference),

AmpersandEqual(TokenReference),

PipeEqual(TokenReference),

JohnnyMorganz · 2025-02-22T13:13:27Z

full-moon/src/ast/mod.rs

 #[cfg(any(feature = "lua52", feature = "luajit"))]
 pub mod lua52;
-#[cfg(feature = "lua54")]
+#[cfg(any(feature = "lua54", feature = "cfxlua"))]


Since cfxlua already extends lua54, we don't need to change this config since lua54 should always be enabled

Suggested change

#[cfg(any(feature = "lua54", feature = "cfxlua"))]

#[cfg(feature = "lua54")]

JohnnyMorganz · 2025-02-22T13:13:54Z

full-moon/src/ast/mod.rs

    /// A goto statement, such as `goto label`
    /// Only available when the "lua52" or "luajit" feature flag is enabled.
-    #[cfg(any(feature = "lua52", feature = "luajit"))]
+    #[cfg(any(feature = "lua52", feature = "luajit", feature = "cfxlua"))]


Same as above and in the other cases, I think this can be left alone

Suggested change

#[cfg(any(feature = "lua52", feature = "luajit", feature = "cfxlua"))]

#[cfg(any(feature = "lua52", feature = "luajit"))]

JohnnyMorganz · 2025-02-22T13:26:52Z

full-moon/src/visitors.rs

        visit_attribute => Attribute,
    }
+
+    #[cfg(all(feature = "cfxlua", not(feature = "luau")))] {


I don't quite understand this condition.

We can remove the visit_compound_assignment from the Luau section above and then use any

Suggested change

#[cfg(all(feature = "cfxlua", not(feature = "luau")))] {

#[cfg(any(feature = "cfxlua", feature = "luau"))] {

JohnnyMorganz · 2025-02-22T13:27:20Z

full-moon/src/visitors.rs

    visit_number,
    visit_single_line_comment,
    visit_string_literal,
+    visit_c_style_comment,


Should be gated by a cfxlua check

JohnnyMorganz · 2025-02-22T13:27:36Z

full-moon/src/visitors.rs

 #[cfg(any(feature = "lua52", feature = "luajit"))]
 use crate::ast::lua52::*;
-#[cfg(feature = "lua54")]
+#[cfg(any(feature = "lua54", feature = "cfxlua"))]


Suggested change

#[cfg(any(feature = "lua54", feature = "cfxlua"))]

#[cfg(feature = "lua54")]

JohnnyMorganz · 2025-02-22T13:29:01Z

full-moon/src/ast/mod.rs

+    /// A set constructor field, such as .a inside { .a } which is equivalent to { a = true }
+    #[display("{dot}{name}")]
+    #[cfg(feature = "cfxlua")]
+    SetConstructorField {


We are already in Field, we don't need Field at the end of the name

Suggested change

SetConstructorField {

SetConstructor {

JohnnyMorganz · 2025-02-22T13:32:15Z

full-moon/src/ast/parsers.rs

 };
+
+#[cfg(any(feature = "cfxlua", feature = "luau"))]
+use super::Var;


Looks like this was introduced by your IDE.

You should reference it through ast::Var instead, which is already exported

Resolve flaws with CFXLua feature

Kuuzoo · 2025-04-04T07:23:09Z

Hi @JohnnyMorganz,
Thank you for your feedback!

I’ve just implemented the suggested changes last night and verified that Clippy is now passing too.

Let me know if there’s anything else you’d like to see.
Thanks again for reviewing!

Kampfkarren · 2025-04-21T00:19:16Z

full-moon/src/ast/compound.rs

+    PlusEqual(TokenReference),
+    MinusEqual(TokenReference),
+    StarEqual(TokenReference),
+    SlashEqual(TokenReference),
+    CaretEqual(TokenReference),


IMO for this and the checks you should do #[cfg(any(feature = "luau", feature = "cfxlua"))]--it makes it clear when adding more what's actually supported by Lua itself (nothing) and what isn't.

Kampfkarren · 2025-04-21T00:19:53Z

full-moon/src/ast/luau.rs

+#[cfg(not(feature = "luau"))]
+#[cfg_attr(docsrs, doc(cfg(not(feature = "luau"))))]
+#[deprecated(
+    since = "full-moon 0.18.0",


We're way past this already, IMO I would ditch since entirely since it doesn't add much value

Kampfkarren · 2025-04-21T00:21:25Z

full-moon/src/tokenizer/lexer.rs

+
+

Nit: Remove these

Kampfkarren · 2025-04-21T00:23:33Z

full-moon/src/util.rs

+// If the vector length is 0 or there is at least one Some -> false
+#[cfg(feature = "luau")]
+#[allow(clippy::ptr_arg)]
+pub fn no_luau_usage<T>(vec: &Vec<Option<T>>) -> bool {


I don't think this is a good name--vec_empty_or_all_none?

@Kampfkarren

resolve latest comments from @Kampfkarren

mdxwzl added 2 commits February 9, 2025 03:23

Support CfxLua

b66a9aa

Add CfxLua to Workflows

05ac2a4

mdxwzl force-pushed the main branch from 5275177 to 05ac2a4 Compare February 9, 2025 04:51

mdxwzl marked this pull request as draft February 9, 2025 04:51

mdxwzl force-pushed the main branch from 7cedd70 to b66a9aa Compare February 9, 2025 05:01

mdxwzl marked this pull request as ready for review February 9, 2025 19:43

mdxwzl force-pushed the main branch 2 times, most recently from b1ac9c0 to 942e98d Compare February 10, 2025 07:28

Format Source

1b89a3d

mdxwzl force-pushed the main branch from 942e98d to 1b89a3d Compare February 10, 2025 08:33

Gellipapa mentioned this pull request Feb 17, 2025

Support FiveM Lua syntax JohnnyMorganz/StyLua#855

Closed

mdxwzl added 2 commits February 20, 2025 06:52

Skip serializing type_specifiers in GenericFor

c3a4131

Update Tests

128d655

JohnnyMorganz reviewed Feb 22, 2025

View reviewed changes

Kuuzoo added 4 commits April 3, 2025 23:41

Add workflow_dispatch trigger to CI workflows

6ff6c29

Refactor CFX Lua feature flags and update related documentation

15b8eee

Update tests to new namings

4f4f568

Remove unnecessary blank lines in CompoundOp implementation

2a4fb78

Kuuzoo mentioned this pull request Apr 3, 2025

Resolve flaws with CFXLua feature mdxwzl/full-moon#2

Merged

Merge pull request #2 from Kuuzoo/main

be5e31d

Resolve flaws with CFXLua feature

Kampfkarren approved these changes Apr 21, 2025

View reviewed changes

Kuuzoo added 5 commits April 21, 2025 02:33

Rename no_luau_usage to vec_empty_or_all_none

1e17b4d

Add cfg attributes for CompoundOp variants to support feature flags

06fa10e

Remove unnecessary blank lines

0c4a672

Remove deprecated since value

2d23d10

run formatter

7011a3f

Kuuzoo and others added 4 commits April 21, 2025 02:54

resolve clippy tests

9eade37

resolve clippy tests

350bf20

run formatter

bc0f978

Merge pull request #3 from Kuuzoo/main

ffc016c

resolve latest comments from @Kampfkarren

Kampfkarren merged commit 87d68b2 into Kampfkarren:main Apr 21, 2025
2 checks passed

	#[cfg(any(feature = "lua54", feature = "cfxlua"))]
	#[cfg(feature = "lua54")]

	#[cfg(any(feature = "lua52", feature = "luajit", feature = "cfxlua"))]
	#[cfg(any(feature = "lua52", feature = "luajit"))]

	#[cfg(all(feature = "cfxlua", not(feature = "luau")))] {
	#[cfg(any(feature = "cfxlua", feature = "luau"))] {

Support CfxLua #338

Support CfxLua #338

Uh oh!

Conversation

mdxwzl commented Feb 9, 2025

Uh oh!

mdxwzl commented Feb 9, 2025

Uh oh!

mdxwzl commented Feb 10, 2025

Uh oh!

mdxwzl commented Feb 20, 2025

Uh oh!

JohnnyMorganz left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Kuuzoo commented Apr 4, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants