Replace "function" with "subroutine" for OQ3 subroutines

crates/oq3_parser/src/grammar/expressions.rs

@@ -387,14 +387,14 @@ fn postfix_expr(
     (lhs, block_like)
 }
 
-// Consumes either a function (def) call, or a gate call.
+// Consumes either a subroutine (def) call, or a gate call.
 fn call_expr(p: &mut Parser<'_>, lhs: CompletedMarker) -> CompletedMarker {
     assert!(p.at(T!['(']));
     let m = lhs.precede(p);
     call_arg_list(p);
     // If after consuming `(x,y,..)` we find an identifier, it must be
     // a gate call statement. `expr_stmt` has already begun but will be abandoned.
-    // If there is no identifier, it is a function call.
+    // If there is no identifier, it is a subroutine call.
     if matches!(p.current(), IDENT | HARDWAREIDENT) {
         params::arg_list_gate_call_qubits(p);
         return m.complete(p, GATE_CALL_EXPR);
@@ -535,7 +535,7 @@ pub(crate) fn designator(p: &mut Parser<'_>) -> bool {
     // syntax errors here.
     //
     // We assume here that it is not allowed to cast types to integer, even
-    // those that would be allowed in, say, arguments to function calls. I don't
+    // those that would be allowed in, say, arguments to subroutine calls. I don't
     // see this addressed in the spec.
     if matches!(
         p.current(),
@@ -602,7 +602,7 @@ pub(crate) fn index_operator(p: &mut Parser<'_>) {
     m.complete(p, INDEX_OPERATOR);
 }
 
-// For function call and gate call
+// For subroutine call and gate call
 // Cannot enforce no empty parens in gate call here.
 pub(crate) fn call_arg_list(p: &mut Parser<'_>) {
     let bra = T!['('];

crates/oq3_parser/src/grammar/params.rs

@@ -28,7 +28,7 @@ pub(super) fn arg_list_gate_call_qubits(p: &mut Parser<'_>) {
 }
 
 pub(super) fn param_list_def_params(p: &mut Parser<'_>) {
-    // Function definition parameter list: (t0 p0, t1 p1, ...)
+    // Subroutine definition parameter list: (t0 p0, t1 p1, ...)
     // - parens: yes
     // - typed: yes
     // - terminator: ')'

crates/oq3_semantics/src/context.rs

@@ -25,8 +25,8 @@ pub struct Context {
     pub const_values: HashMap<SymbolId, asg::TExpr>,
 
     /// Temporary storage for annoations. Annotations are pushed here as they are
-    /// parsed. When the annotated function definition is parsed, the annotations are attached
-    /// to the representation of the function definition.
+    /// parsed. When the annotated subroutine definition is parsed, the annotations are attached
+    /// to the representation of the subroutine definition.
     pub annotations: Vec<asg::Annotation>,
 }
 

crates/pipeline-tests/tools/expect_summary.py

@@ -81,9 +81,10 @@ def main():
     for st in STAGES:
         c = counts[st]
         # Print in a fixed order; include unset if present
-        parts = [f"{k}={c[k]}" for k in order if c[k] > 0]
+#        parts = [f"{k}={c[k]}" for k in order if c[k] > 0]
+        parts = [f"{k}={c[k]:<3}" for k in order if c[k] > 0]
         total = sum(c.values())
-        print(f"- {st:<{STAGE_W}}: total={total}; " + ", ".join(parts))
+        print(f"- {st:<{STAGE_W}}: total={total:<3}; " + ", ".join(parts))
 
     return 0