From 862506598d299d4bf8a97bfebc024109173f6eda Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Tue, 19 Nov 2024 02:59:40 -0800 Subject: [PATCH] nix: update lockfile + parser for RESET and FINAL --- flake.lock | 12 ++++++------ typegen/src/parse.rs | 2 +- types/QtQuick.json | 5 +++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 502fa20..c804ff4 100644 --- a/flake.lock +++ b/flake.lock @@ -22,17 +22,17 @@ ] }, "locked": { - "lastModified": 1730842284, - "narHash": "sha256-s0doicDkqzCqHvplBnjWPJtGJwajjDdfVkmmPu32l6Q=", + "lastModified": 1732015771, + "narHash": "sha256-kOKOa+wSpmJOX5GZagxF3WTmfCSB2sQOTggSjbLUgSI=", "ref": "refs/heads/master", - "rev": "b528be94260b572919ff47d2f5e3150ebc1ee3e9", - "revCount": 368, + "rev": "f4066cb4edd96b0152ab9b2b1bec821cd5c9da57", + "revCount": 385, "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + "url": "https://git.outfoxxed.me/quickshell/quickshell" }, "original": { "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + "url": "https://git.outfoxxed.me/quickshell/quickshell" } }, "root": { diff --git a/typegen/src/parse.rs b/typegen/src/parse.rs index ec7f56d..d04337e 100644 --- a/typegen/src/parse.rs +++ b/typegen/src/parse.rs @@ -162,7 +162,7 @@ impl CppParser { Self { class_regex: Regex::new(r#"(?(\s*\/\/\/.*\n)+)?\s*class\s+(?\w+)(?:\s*:\s*public\s+((?\w+)(<.+>)?)(\s*,(\s*\w+)*)*)?\s*\{(?[\s\S]*?)(?!};\s*Q_ENUM)};"#).unwrap(), macro_regex: Regex::new(r#"(?(\s*\/\/\/.*\n)+)?\s*(?QSDOC_HIDE\s)?(?(Q|QML|QSDOC)_\w+)\s*(\(\s*(?.*)\s*\))?;"#).unwrap(), - property_regex: Regex::new(r#"^\s*(?(\w|::|, |<|>|\*)+)\*?\s+(?\w+)(\s+(MEMBER\s+(?\w+)|READ\s+(?\w+)|WRITE\s+(?\w+)|NOTIFY\s+(?\w+)|(?CONSTANT)))+\s*$"#).unwrap(), + property_regex: Regex::new(r#"^\s*(?(\w|::|, |<|>|\*)+)\*?\s+(?\w+)(\s+(MEMBER\s+(?\w+)|READ\s+(?\w+)|WRITE\s+(?\w+)|RESET\s+(?\w+)|NOTIFY\s+(?\w+)|(?CONSTANT)|(?FINAL)))+\s*$"#).unwrap(), fn_regex: Regex::new(r#"(?(\s*\/\/\/.*\n)+)?\s*(\/\/@\s+)?Q_INVOKABLE\s+(\[\[.*\]\]\s+)?(static\s+)?(?(\w|::|<|>)+\*?)\s+(?\w+)\((?[\s\S]*?)\)(\s*const)?;"#).unwrap(), signal_regex: Regex::new(r#"(?(\s*\/\/\/.*\n)+)?\s*void\s+(?\w+)\((?[\s\S]*?)\);"#).unwrap(), fn_param_regex: Regex::new(r#"(const\s+)?(?(\w|::|<|>)+\*?)&?\s+(?\w+)(,|$)"#).unwrap(), diff --git a/types/QtQuick.json b/types/QtQuick.json index b799f19..97c2a7b 100644 --- a/types/QtQuick.json +++ b/types/QtQuick.json @@ -105,6 +105,11 @@ "cname": "QQuickItem", "module": "qml.QtQuick" }, + { + "name": "Rectangle", + "cname": "QQuickItem", + "module": "qml.QtQuick" + }, { "name": "Image", "cname": "",