fprime-fpp-python 3.3.17__tar.gz → 3.3.18__tar.gz

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/Cargo.lock

@@ -352,7 +352,7 @@ dependencies = [
 
 [[package]]
 name = "fpp"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "fpp_analysis",
  "fpp_core",
@@ -363,7 +363,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_analysis"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "fpp_ast",
  "fpp_core",
@@ -378,7 +378,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_ast"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "fpp_core",
  "fpp_macros",
@@ -386,7 +386,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_core"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "line-index",
  "rustc-hash 2.1.1",
@@ -395,7 +395,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_diagram"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "clap",
  "fpp_analysis",
@@ -412,7 +412,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_errors"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "annotate-snippets",
  "anstream",
@@ -421,7 +421,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_format"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "clap",
  "fpp_lsp_parser",
@@ -430,14 +430,14 @@ dependencies = [
 
 [[package]]
 name = "fpp_fs"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "fpp_core",
 ]
 
 [[package]]
 name = "fpp_lexer"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "memchr",
  "pretty_assertions",
@@ -446,7 +446,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_lsp_parser"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "drop_bomb",
  "fpp_lexer",
@@ -456,7 +456,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_lsp_server"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "anyhow",
  "clap",
@@ -485,7 +485,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_macros"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -495,7 +495,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_parser"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "fpp_ast",
  "fpp_core",
@@ -508,11 +508,12 @@ dependencies = [
 
 [[package]]
 name = "fpp_python"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "fpp_analysis",
  "fpp_ast",
  "fpp_core",
+ "fpp_errors",
  "fpp_fs",
  "fpp_parser",
  "fpp_python_macros",
@@ -523,7 +524,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_python_bindgen"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "rustdoc-json",
  "rustdoc-types",
@@ -533,7 +534,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_python_macros"
-version = "3.3.17"
+version = "3.3.18"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -542,7 +543,7 @@ dependencies = [
 
 [[package]]
 name = "fpp_util"
-version = "3.3.17"
+version = "3.3.18"
 
 [[package]]
 name = "getopts"

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/Cargo.toml

@@ -4,7 +4,7 @@ members = ["fpp_analysis", "fpp_ast", "fpp_core", "fpp_errors", "fpp_fs", "fpp_l
 resolver = "2"
 
 [workspace.package]
-version = "3.3.17"
+version = "3.3.18"
 edition = "2024"
 authors = ["Andrei Tumbar"]
 license = "Apache-2.0"

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fprime-fpp-python
-Version: 3.3.17
+Version: 3.3.18
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Software Development :: Compilers
@@ -44,7 +44,9 @@ module M {
 
 model.has_errors                             # False
 for d in model.diagnostics:
+    d.level                                  # fpp.DiagnosticLevel.Error
     print(d.display)                         # 'path:line:col: error: message'
+    print(d)                                 # the compiler's console rendering
 
 (unit,) = model.ast                          # one translation unit per input
 (module,) = unit.members
@@ -99,6 +101,24 @@ match arr.definition.resolved_type:
         isinstance(elt, fpp.PrimitiveIntType) and elt.value == fpp.IntegerKind.U32
 ```
 
+Findings of your own report like compiler errors: build a `Diagnostic` against
+any node's `span`, add child annotations and notes, and `print` it.
+
+```python
+node = model.lookup("M.answer").definition
+print(fpp.Diagnostic(
+    fpp.DiagnosticLevel.Warning, "answer is unused",
+    span=node.span,
+    children=[fpp.DiagnosticMessage("delete it")],
+))
+#  --> mem.fpp:4:3
+#   |
+# 4 |   constant answer = 6 * 7
+#   |   ^^^^^^^^^^^^^^^^^^^^^^^ answer is unused
+#   |
+#   = note: delete it
+```
+
 `fpp.pyi` is the reference for the rest — every class, getter and return type —
 and the docstrings carry the contracts: `help(fpp.analyze)`, `help(fpp.Model)`,
 `help(fpp.NodeVisitor)`.

{fprime_fpp_python-3.3.17/fpp_python → fprime_fpp_python-3.3.18}/README.md

@@ -28,7 +28,9 @@ module M {
 
 model.has_errors                             # False
 for d in model.diagnostics:
+    d.level                                  # fpp.DiagnosticLevel.Error
     print(d.display)                         # 'path:line:col: error: message'
+    print(d)                                 # the compiler's console rendering
 
 (unit,) = model.ast                          # one translation unit per input
 (module,) = unit.members
@@ -83,6 +85,24 @@ match arr.definition.resolved_type:
         isinstance(elt, fpp.PrimitiveIntType) and elt.value == fpp.IntegerKind.U32
 ```
 
+Findings of your own report like compiler errors: build a `Diagnostic` against
+any node's `span`, add child annotations and notes, and `print` it.
+
+```python
+node = model.lookup("M.answer").definition
+print(fpp.Diagnostic(
+    fpp.DiagnosticLevel.Warning, "answer is unused",
+    span=node.span,
+    children=[fpp.DiagnosticMessage("delete it")],
+))
+#  --> mem.fpp:4:3
+#   |
+# 4 |   constant answer = 6 * 7
+#   |   ^^^^^^^^^^^^^^^^^^^^^^^ answer is unused
+#   |
+#   = note: delete it
+```
+
 `fpp.pyi` is the reference for the rest — every class, getter and return type —
 and the docstrings carry the contracts: `help(fpp.analyze)`, `help(fpp.Model)`,
 `help(fpp.NodeVisitor)`.

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_analysis/Cargo.toml

@@ -13,11 +13,11 @@ repository.workspace = true
 disabled-tests = []
 
 [dependencies]
-fpp_ast = { path = "../fpp_ast", version = "=3.3.17" }
-fpp_core = { path = "../fpp_core", version = "=3.3.17" }
-fpp_util = { path = "../fpp_util", version = "=3.3.17" }
-fpp_macros = { path = "../fpp_macros", version = "=3.3.17" }
-fpp_parser = { path = "../fpp_parser", version = "=3.3.17" }
+fpp_ast = { path = "../fpp_ast", version = "=3.3.18" }
+fpp_core = { path = "../fpp_core", version = "=3.3.18" }
+fpp_util = { path = "../fpp_util", version = "=3.3.18" }
+fpp_macros = { path = "../fpp_macros", version = "=3.3.18" }
+fpp_parser = { path = "../fpp_parser", version = "=3.3.18" }
 rustc-hash = "2.1.1"
 
 [dev-dependencies]

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_ast/Cargo.toml

@@ -9,5 +9,5 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-fpp_core = { path = "../fpp_core", version = "=3.3.17" }
-fpp_macros = { path = "../fpp_macros", version = "=3.3.17" }
+fpp_core = { path = "../fpp_core", version = "=3.3.18" }
+fpp_macros = { path = "../fpp_macros", version = "=3.3.18" }

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_core/src/context.rs

@@ -164,14 +164,14 @@ pub struct NodeData {
     pub post_annotation: Vec<String>,
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct DiagnosticDataIncludeLocation {
     pub line: u32,
     pub column: u32,
     pub uri: String,
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub struct DiagnosticDataSnippet {
     pub start: BytePos,
     pub end: BytePos,

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_core/src/diagnostic.rs

@@ -15,7 +15,7 @@ pub enum Level {
     Help,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum DiagnosticMessageKind {
     Primary,
     Note,

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_errors/Cargo.toml

@@ -11,4 +11,4 @@ repository.workspace = true
 [dependencies]
 annotate-snippets = "0.12.8"
 anstream = "0.6.21"
-fpp_core = { path = "../fpp_core", version = "=3.3.17" }
+fpp_core = { path = "../fpp_core", version = "=3.3.18" }

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_errors/src/console.rs

@@ -1,6 +1,5 @@
-use crate::snippet::diagnostic_to_snippet_group;
+use crate::owned::{OwnedDiagnostic, renderer};
 use annotate_snippets::Renderer;
-use annotate_snippets::renderer::DecorStyle;
 use fpp_core::{DiagnosticData, Level};
 
 pub struct ConsoleEmitter {
@@ -11,14 +10,14 @@ pub struct ConsoleEmitter {
 impl ConsoleEmitter {
     pub fn color() -> ConsoleEmitter {
         ConsoleEmitter {
-            renderer: Renderer::styled().decor_style(DecorStyle::Ascii),
+            renderer: renderer(true),
             seen_errors: false,
         }
     }
 
     pub fn plain() -> ConsoleEmitter {
         ConsoleEmitter {
-            renderer: Renderer::plain().decor_style(DecorStyle::Ascii),
+            renderer: renderer(false),
             seen_errors: false,
         }
     }
@@ -34,7 +33,9 @@ impl fpp_core::DiagnosticEmitter for &mut ConsoleEmitter {
             self.seen_errors = true;
         }
 
-        let group = diagnostic_to_snippet_group(&diagnostic);
-        anstream::println!("{}\n", self.renderer.render(&[group]));
+        anstream::println!(
+            "{}\n",
+            OwnedDiagnostic::from(&diagnostic).render(&self.renderer)
+        );
     }
 }

fprime_fpp_python-3.3.18/fpp_errors/src/lib.rs

@@ -0,0 +1,9 @@
+mod console;
+mod owned;
+mod snippet;
+mod write;
+
+pub use annotate_snippets::Renderer;
+pub use console::ConsoleEmitter;
+pub use owned::{OwnedDiagnostic, OwnedDiagnosticMessage, renderer};
+pub use write::WriteEmitter;

fprime_fpp_python-3.3.18/fpp_errors/src/owned.rs

@@ -0,0 +1,74 @@
+//! An owned, context-free copy of a [`DiagnosticData`].
+//!
+//! `DiagnosticData` borrows the compiler context: its spans hold a `Weak`
+//! reference to the source file, so resolving one after the context is gone
+//! panics. [`OwnedDiagnostic`] resolves every span to its
+//! [`DiagnosticDataSnippet`] up front — the covered source lines, the byte range
+//! inside them, and the include chain — so it can be stored, moved between
+//! threads, and rendered later.
+//!
+//! Rendering goes through the same group builder the emitters use, so an owned
+//! diagnostic renders byte-for-byte like the one the console printed.
+
+use crate::snippet::diagnostic_to_snippet_group;
+use annotate_snippets::Renderer;
+use annotate_snippets::renderer::DecorStyle;
+use fpp_core::{DiagnosticData, DiagnosticDataSnippet, DiagnosticMessageKind, Level};
+
+/// A diagnostic detached from the compiler context that produced it.
+#[derive(Clone, Debug)]
+pub struct OwnedDiagnostic {
+    pub level: Level,
+    pub message: String,
+    /// The primary source location. `None` for a diagnostic with no location —
+    /// one built by hand rather than emitted by the compiler.
+    pub snippet: Option<DiagnosticDataSnippet>,
+    pub children: Vec<OwnedDiagnosticMessage>,
+}
+
+/// A child message of an [`OwnedDiagnostic`]: a further annotated span, or a
+/// standalone note.
+#[derive(Clone, Debug)]
+pub struct OwnedDiagnosticMessage {
+    pub kind: DiagnosticMessageKind,
+    pub message: String,
+    pub snippet: Option<DiagnosticDataSnippet>,
+}
+
+impl From<&DiagnosticData> for OwnedDiagnostic {
+    fn from(diagnostic: &DiagnosticData) -> OwnedDiagnostic {
+        OwnedDiagnostic {
+            level: diagnostic.level,
+            message: diagnostic.message.clone(),
+            snippet: Some(diagnostic.span.snippet()),
+            children: diagnostic
+                .children
+                .iter()
+                .map(|child| OwnedDiagnosticMessage {
+                    kind: child.kind,
+                    message: child.message.clone(),
+                    snippet: child.span.as_ref().map(|span| span.snippet()),
+                })
+                .collect(),
+        }
+    }
+}
+
+impl OwnedDiagnostic {
+    /// Render this diagnostic the way an emitter would, without the trailing
+    /// blank line the emitters add between diagnostics.
+    pub fn render(&self, renderer: &Renderer) -> String {
+        renderer.render(&[diagnostic_to_snippet_group(self)])
+    }
+}
+
+/// The renderer the emitters use: ASCII decorations, with ANSI styling when
+/// `color`.
+pub fn renderer(color: bool) -> Renderer {
+    let renderer = if color {
+        Renderer::styled()
+    } else {
+        Renderer::plain()
+    };
+    renderer.decor_style(DecorStyle::Ascii)
+}

fprime_fpp_python-3.3.18/fpp_errors/src/snippet.rs

@@ -0,0 +1,85 @@
+use crate::owned::{OwnedDiagnostic, OwnedDiagnosticMessage};
+use annotate_snippets::{Annotation, AnnotationKind, Element, Group, Snippet};
+use fpp_core::{DiagnosticDataSnippet, DiagnosticMessageKind, Level};
+
+fn diagnostic_level<'a>(level: Level) -> annotate_snippets::Level<'a> {
+    match level {
+        Level::Error => annotate_snippets::Level::ERROR,
+        Level::Warning => annotate_snippets::Level::WARNING,
+        Level::Note => annotate_snippets::Level::NOTE,
+        Level::Help => annotate_snippets::Level::HELP,
+        _ => annotate_snippets::Level::INFO,
+    }
+}
+
+fn diagnostic_snippet_to_annotation<'a>(
+    message: String,
+    kind: AnnotationKind,
+    snippet: &DiagnosticDataSnippet,
+) -> Annotation<'a> {
+    kind.span((snippet.start as usize)..(snippet.end as usize))
+        .label(message)
+}
+
+/// The annotated source excerpt for one span of a diagnostic, followed by a note
+/// per `include` that spliced its source in.
+fn snippet_elements<'a>(
+    message: String,
+    kind: AnnotationKind,
+    snippet: &DiagnosticDataSnippet,
+) -> Vec<Element<'a>> {
+    let excerpt = Snippet::source(snippet.file_content.clone())
+        .line_start(snippet.line_offset + 1)
+        .path(snippet.uri.clone())
+        .annotation(diagnostic_snippet_to_annotation(message, kind, snippet));
+
+    std::iter::once(Element::from(excerpt))
+        .chain(snippet.include_spans.iter().map(|include_loc| {
+            Element::Message(annotate_snippets::Level::NOTE.message(format!(
+                "included from {}:{}:{}",
+                include_loc.uri,
+                include_loc.line + 1,
+                include_loc.column + 1
+            )))
+        }))
+        .collect()
+}
+
+fn child_elements<'a>(level: Level, child: &OwnedDiagnosticMessage) -> Vec<Element<'a>> {
+    match &child.snippet {
+        None => vec![Element::Message(
+            (match child.kind {
+                DiagnosticMessageKind::Primary => diagnostic_level(level),
+                DiagnosticMessageKind::Note => diagnostic_level(Level::Note),
+            })
+            .message(child.message.clone()),
+        )],
+        Some(snippet) => snippet_elements(
+            child.message.clone(),
+            match child.kind {
+                DiagnosticMessageKind::Primary => AnnotationKind::Primary,
+                DiagnosticMessageKind::Note => AnnotationKind::Context,
+            },
+            snippet,
+        ),
+    }
+}
+
+pub(crate) fn diagnostic_to_snippet_group(diagnostic: &'_ OwnedDiagnostic) -> Group<'_> {
+    let level = diagnostic_level(diagnostic.level);
+    let group = match &diagnostic.snippet {
+        None => Group::with_title(level.primary_title(diagnostic.message.clone())),
+        Some(snippet) => Group::with_level(level).elements(snippet_elements(
+            diagnostic.message.clone(),
+            AnnotationKind::Primary,
+            snippet,
+        )),
+    };
+
+    group.elements(
+        diagnostic
+            .children
+            .iter()
+            .flat_map(|child| child_elements(diagnostic.level, child)),
+    )
+}

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_errors/src/write.rs

@@ -1,6 +1,5 @@
-use crate::snippet::diagnostic_to_snippet_group;
+use crate::owned::{OwnedDiagnostic, renderer};
 use annotate_snippets::Renderer;
-use annotate_snippets::renderer::DecorStyle;
 use fpp_core::{DiagnosticData, DiagnosticEmitter};
 use std::io::Write;
 
@@ -12,7 +11,7 @@ pub struct WriteEmitter<W: Write> {
 impl<W: Write> WriteEmitter<W> {
     pub fn new(w: W) -> WriteEmitter<W> {
         WriteEmitter {
-            renderer: Renderer::plain().decor_style(DecorStyle::Ascii),
+            renderer: renderer(false),
             write: w,
         }
     }
@@ -20,8 +19,7 @@ impl<W: Write> WriteEmitter<W> {
 
 impl<W: Write> DiagnosticEmitter for WriteEmitter<W> {
     fn emit(&mut self, diagnostic: DiagnosticData) {
-        let group = diagnostic_to_snippet_group(&diagnostic);
-        let mut out = self.renderer.render(&[group]);
+        let mut out = OwnedDiagnostic::from(&diagnostic).render(&self.renderer);
         out.push('\n');
         out.push('\n');
         self.write

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_fs/Cargo.toml

@@ -9,4 +9,4 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-fpp_core = { path = "../fpp_core", version = "=3.3.17" }
+fpp_core = { path = "../fpp_core", version = "=3.3.18" }

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_parser/Cargo.toml

@@ -10,9 +10,9 @@ repository.workspace = true
 readme = "README.md"
 
 [dependencies]
-fpp_lexer = { path = "../fpp_lexer", version = "=3.3.17" }
-fpp_core = { path = "../fpp_core", version = "=3.3.17" }
-fpp_ast = { path = "../fpp_ast", version = "=3.3.17" }
+fpp_lexer = { path = "../fpp_lexer", version = "=3.3.18" }
+fpp_core = { path = "../fpp_core", version = "=3.3.18" }
+fpp_ast = { path = "../fpp_ast", version = "=3.3.18" }
 rustc-hash = "2.1.1"
 
 [dev-dependencies]

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_parser/tests/cycle-1.ref.txt

@@ -1,8 +1,10 @@
  --> [ local path prefix ]/cycle-3.fpp:1:1
   |
 1 | include "cycle-1.fpp"
-  | ^^^^^^^^^^^^^^^^^^^^^ included from [ local path prefix ]/cycle-1.fpp:1:1
+  | ^^^^^^^^^^^^^^^^^^^^^ include cycle detected
   |
+  = note: included from [ local path prefix ]/cycle-2.fpp:1:1
+  = note: included from [ local path prefix ]/cycle-1.fpp:1:1
   = note: included from [ local path prefix ]/cycle-3.fpp:1:1
   = note: included from [ local path prefix ]/cycle-2.fpp:1:1
   = note: included from [ local path prefix ]/cycle-1.fpp:1:1

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_parser/tests/cycle-2.ref.txt

@@ -1,8 +1,10 @@
  --> [ local path prefix ]/cycle-1.fpp:1:1
   |
 1 | include "cycle-2.fpp"
-  | ^^^^^^^^^^^^^^^^^^^^^ included from [ local path prefix ]/cycle-2.fpp:1:1
+  | ^^^^^^^^^^^^^^^^^^^^^ include cycle detected
   |
+  = note: included from [ local path prefix ]/cycle-3.fpp:1:1
+  = note: included from [ local path prefix ]/cycle-2.fpp:1:1
   = note: included from [ local path prefix ]/cycle-1.fpp:1:1
   = note: included from [ local path prefix ]/cycle-3.fpp:1:1
   = note: included from [ local path prefix ]/cycle-2.fpp:1:1

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_parser/tests/cycle-3.ref.txt

@@ -1,8 +1,10 @@
  --> [ local path prefix ]/cycle-2.fpp:1:1
   |
 1 | include "cycle-3.fpp"
-  | ^^^^^^^^^^^^^^^^^^^^^ included from [ local path prefix ]/cycle-3.fpp:1:1
+  | ^^^^^^^^^^^^^^^^^^^^^ include cycle detected
   |
+  = note: included from [ local path prefix ]/cycle-1.fpp:1:1
+  = note: included from [ local path prefix ]/cycle-3.fpp:1:1
   = note: included from [ local path prefix ]/cycle-2.fpp:1:1
   = note: included from [ local path prefix ]/cycle-1.fpp:1:1
   = note: included from [ local path prefix ]/cycle-3.fpp:1:1

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_parser/tests/include-parse-error.ref.txt

@@ -1,24 +1,27 @@
  --> [ local path prefix ]/parse-error.fpp:5:1
   |
 5 | + c
-  | ^ included from [ local path prefix ]/include-parse-error.fpp:1:1
+  | ^ syntax error: module member expected
   |
+  = note: included from [ local path prefix ]/include-parse-error.fpp:1:1
   = note: expected one of type, array, constant, enum, struct, component, active, passive, queued, interface, module, port, state, system, deployment, topology, include, locate
   = note: got +
 
  --> [ local path prefix ]/parse-error.fpp:7:1
   |
 7 | + c
-  | ^ included from [ local path prefix ]/include-parse-error.fpp:1:1
+  | ^ syntax error: module member expected
   |
+  = note: included from [ local path prefix ]/include-parse-error.fpp:1:1
   = note: expected one of type, array, constant, enum, struct, component, active, passive, queued, interface, module, port, state, system, deployment, topology, include, locate
   = note: got +
 
   --> [ local path prefix ]/parse-error.fpp:14:11
    |
 14 |     async input i: d -> d
-   |           ^^^^^ included from [ local path prefix ]/include-parse-error.fpp:1:1
+   |           ^^^^^ syntax error: unexpected token
    |
+   = note: included from [ local path prefix ]/include-parse-error.fpp:1:1
    = note: expected port
    = note: got identifier
 
@@ -27,8 +30,9 @@
 18 |       ) severity warning low format "hello" throttle 1
    |  _____________________________________________________^
 19 | |
-   | |_^ included from [ local path prefix ]/include-parse-error.fpp:1:1
+   | |_^ syntax error: unexpected token
    |
+   = note: included from [ local path prefix ]/include-parse-error.fpp:1:1
    = note: expected }
    = note: got eof
 

{fprime_fpp_python-3.3.17 → fprime_fpp_python-3.3.18}/fpp_python/Cargo.toml

@@ -37,14 +37,15 @@ pyo3-stub-gen = { version = "0.23", default-features = false, features = [
 ] }
 
 # Attribute macros that remove wrapper boilerplate (in-workspace proc-macro crate).
-fpp_python_macros = { path = "../fpp_python_macros", version = "=3.3.17" }
+fpp_python_macros = { path = "../fpp_python_macros", version = "=3.3.18" }
 
 # FPP compiler crates (in-workspace path deps).
-fpp_core = { path = "../fpp_core", version = "=3.3.17" }
-fpp_ast = { path = "../fpp_ast", version = "=3.3.17" }
-fpp_analysis = { path = "../fpp_analysis", version = "=3.3.17" }
-fpp_parser = { path = "../fpp_parser", version = "=3.3.17" }
-fpp_fs = { path = "../fpp_fs", version = "=3.3.17" }
+fpp_core = { path = "../fpp_core", version = "=3.3.18" }
+fpp_ast = { path = "../fpp_ast", version = "=3.3.18" }
+fpp_analysis = { path = "../fpp_analysis", version = "=3.3.18" }
+fpp_parser = { path = "../fpp_parser", version = "=3.3.18" }
+fpp_fs = { path = "../fpp_fs", version = "=3.3.18" }
+fpp_errors = { path = "../fpp_errors", version = "=3.3.18" }
 
 rustc-hash = "2"