Skip to content

Commit 142c6f3

Browse files
WardBrianWardBrian
committed
Update test, add basic annotation test
1 parent 06b540d commit 142c6f3

File tree

14 files changed

+2378
-1971
lines changed

14 files changed

+2378
-1971
lines changed

‎src/frontend/parser.mly‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ function_def:
278278
{
279279
grammar_logger "function_def" ;
280280
{stmt=FunDef {returntype; funname; arguments; annotations; body};
281-
smeta={loc=location_span_of_positions $loc}
281+
smeta={loc=location_span_of_positions $sloc}
282282
}
283283
}
284284

‎test/integration/good/code-gen/mir.expected‎

Lines changed: 376 additions & 321 deletions
Large diffs are not rendered by default.

‎test/integration/good/code-gen/profiling/transformed_mir.expected‎

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@
2424
(prepare_data
2525
(((pattern
2626
(Decl (decl_adtype DataOnly) (decl_id pos__) (decl_type (Sized SInt))
27-
(initialize true)))
27+
(decl_annotations ()) (initialize true)))
2828
(meta <opaque>))
2929
((pattern
3030
(Assignment ((LVariable pos__) ()) UInt
3131
((pattern (Lit Int 1)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly))))))
3232
(meta <opaque>))
3333
((pattern
34-
(Decl (decl_adtype DataOnly) (decl_id N) (decl_type (Sized SInt)) (initialize true)))
34+
(Decl (decl_adtype DataOnly) (decl_id N) (decl_type (Sized SInt))
35+
(decl_annotations ()) (initialize true)))
3536
(meta <opaque>))
3637
((pattern
3738
(Assignment ((LVariable N) ()) UInt
@@ -70,7 +71,7 @@
7071
(Sized
7172
(SArray SReal
7273
((pattern (Var N)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly)))))))
73-
(initialize true)))
74+
(decl_annotations ()) (initialize true)))
7475
(meta <opaque>))
7576
((pattern
7677
(Assignment ((LVariable x) ()) (UArray UReal)
@@ -92,13 +93,14 @@
9293
(Sized
9394
(SVector AoS
9495
((pattern (Var N)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly)))))))
95-
(initialize true)))
96+
(decl_annotations ()) (initialize true)))
9697
(meta <opaque>))
9798
((pattern
9899
(Block
99100
(((pattern
100101
(Decl (decl_adtype AutoDiffable) (decl_id y_flat__)
101-
(decl_type (Unsized (UArray UReal))) (initialize false)))
102+
(decl_type (Unsized (UArray UReal))) (decl_annotations ())
103+
(initialize false)))
102104
(meta <opaque>))
103105
((pattern
104106
(Assignment ((LVariable y_flat__) ()) (UArray UReal)
@@ -153,7 +155,7 @@
153155
(meta <opaque>))
154156
((pattern
155157
(Decl (decl_adtype DataOnly) (decl_id sum_y) (decl_type (Sized SReal))
156-
(initialize true)))
158+
(decl_annotations ()) (initialize true)))
157159
(meta <opaque>))
158160
((pattern
159161
(Profile "\"sum\""
@@ -169,7 +171,7 @@
169171
(log_prob
170172
(((pattern
171173
(Decl (decl_adtype AutoDiffable) (decl_id rho) (decl_type (Sized SReal))
172-
(initialize true)))
174+
(decl_annotations ()) (initialize true)))
173175
(meta <opaque>))
174176
((pattern
175177
(Assignment ((LVariable rho) ()) UReal
@@ -187,7 +189,7 @@
187189
(meta <opaque>))
188190
((pattern
189191
(Decl (decl_adtype AutoDiffable) (decl_id alpha) (decl_type (Sized SReal))
190-
(initialize true)))
192+
(decl_annotations ()) (initialize true)))
191193
(meta <opaque>))
192194
((pattern
193195
(Assignment ((LVariable alpha) ()) UReal
@@ -205,7 +207,7 @@
205207
(meta <opaque>))
206208
((pattern
207209
(Decl (decl_adtype AutoDiffable) (decl_id sigma) (decl_type (Sized SReal))
208-
(initialize true)))
210+
(decl_annotations ()) (initialize true)))
209211
(meta <opaque>))
210212
((pattern
211213
(Assignment ((LVariable sigma) ()) UReal
@@ -246,7 +248,7 @@
246248
(SMatrix AoS
247249
((pattern (Var N)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly))))
248250
((pattern (Var N)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly)))))))
249-
(initialize true)))
251+
(decl_annotations ()) (initialize true)))
250252
(meta <opaque>))
251253
((pattern
252254
(NRFunApp (CompilerInternal FnValidateSize)
@@ -271,7 +273,7 @@
271273
(SMatrix AoS
272274
((pattern (Var N)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly))))
273275
((pattern (Var N)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly)))))))
274-
(initialize true)))
276+
(decl_annotations ()) (initialize true)))
275277
(meta <opaque>))
276278
((pattern
277279
(Profile "\"cov_exp_quad\""
@@ -406,7 +408,7 @@
406408
(reverse_mode_log_prob
407409
(((pattern
408410
(Decl (decl_adtype AutoDiffable) (decl_id rho) (decl_type (Sized SReal))
409-
(initialize true)))
411+
(decl_annotations ()) (initialize true)))
410412
(meta <opaque>))
411413
((pattern
412414
(Assignment ((LVariable rho) ()) UReal
@@ -424,7 +426,7 @@
424426
(meta <opaque>))
425427
((pattern
426428
(Decl (decl_adtype AutoDiffable) (decl_id alpha) (decl_type (Sized SReal))
427-
(initialize true)))
429+
(decl_annotations ()) (initialize true)))
428430
(meta <opaque>))
429431
((pattern
430432
(Assignment ((LVariable alpha) ()) UReal
@@ -442,7 +444,7 @@
442444
(meta <opaque>))
443445
((pattern
444446
(Decl (decl_adtype AutoDiffable) (decl_id sigma) (decl_type (Sized SReal))
445-
(initialize true)))
447+
(decl_annotations ()) (initialize true)))
446448
(meta <opaque>))
447449
((pattern
448450
(Assignment ((LVariable sigma) ()) UReal
@@ -483,7 +485,7 @@
483485
(SMatrix AoS
484486
((pattern (Var N)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly))))
485487
((pattern (Var N)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly)))))))
486-
(initialize true)))
488+
(decl_annotations ()) (initialize true)))
487489
(meta <opaque>))
488490
((pattern
489491
(NRFunApp (CompilerInternal FnValidateSize)
@@ -508,7 +510,7 @@
508510
(SMatrix AoS
509511
((pattern (Var N)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly))))
510512
((pattern (Var N)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly)))))))
511-
(initialize true)))
513+
(decl_annotations ()) (initialize true)))
512514
(meta <opaque>))
513515
((pattern
514516
(Profile "\"cov_exp_quad\""
@@ -643,7 +645,7 @@
643645
(generate_quantities
644646
(((pattern
645647
(Decl (decl_adtype DataOnly) (decl_id rho) (decl_type (Sized SReal))
646-
(initialize true)))
648+
(decl_annotations ()) (initialize true)))
647649
(meta <opaque>))
648650
((pattern
649651
(Assignment ((LVariable rho) ()) UReal
@@ -661,7 +663,7 @@
661663
(meta <opaque>))
662664
((pattern
663665
(Decl (decl_adtype DataOnly) (decl_id alpha) (decl_type (Sized SReal))
664-
(initialize true)))
666+
(decl_annotations ()) (initialize true)))
665667
(meta <opaque>))
666668
((pattern
667669
(Assignment ((LVariable alpha) ()) UReal
@@ -679,7 +681,7 @@
679681
(meta <opaque>))
680682
((pattern
681683
(Decl (decl_adtype DataOnly) (decl_id sigma) (decl_type (Sized SReal))
682-
(initialize true)))
684+
(decl_annotations ()) (initialize true)))
683685
(meta <opaque>))
684686
((pattern
685687
(Assignment ((LVariable sigma) ()) UReal
@@ -745,7 +747,7 @@
745747
(transform_inits
746748
(((pattern
747749
(Decl (decl_adtype AutoDiffable) (decl_id rho) (decl_type (Sized SReal))
748-
(initialize true)))
750+
(decl_annotations ()) (initialize true)))
749751
(meta <opaque>))
750752
((pattern
751753
(Assignment ((LVariable rho) ()) UReal
@@ -775,7 +777,7 @@
775777
(meta <opaque>))
776778
((pattern
777779
(Decl (decl_adtype AutoDiffable) (decl_id alpha) (decl_type (Sized SReal))
778-
(initialize true)))
780+
(decl_annotations ()) (initialize true)))
779781
(meta <opaque>))
780782
((pattern
781783
(Assignment ((LVariable alpha) ()) UReal
@@ -805,7 +807,7 @@
805807
(meta <opaque>))
806808
((pattern
807809
(Decl (decl_adtype AutoDiffable) (decl_id sigma) (decl_type (Sized SReal))
808-
(initialize true)))
810+
(decl_annotations ()) (initialize true)))
809811
(meta <opaque>))
810812
((pattern
811813
(Assignment ((LVariable sigma) ()) UReal
@@ -836,7 +838,7 @@
836838
(unconstrain_array
837839
(((pattern
838840
(Decl (decl_adtype AutoDiffable) (decl_id rho) (decl_type (Sized SReal))
839-
(initialize true)))
841+
(decl_annotations ()) (initialize true)))
840842
(meta <opaque>))
841843
((pattern
842844
(Assignment ((LVariable rho) ()) UReal
@@ -857,7 +859,7 @@
857859
(meta <opaque>))
858860
((pattern
859861
(Decl (decl_adtype AutoDiffable) (decl_id alpha) (decl_type (Sized SReal))
860-
(initialize true)))
862+
(decl_annotations ()) (initialize true)))
861863
(meta <opaque>))
862864
((pattern
863865
(Assignment ((LVariable alpha) ()) UReal
@@ -878,7 +880,7 @@
878880
(meta <opaque>))
879881
((pattern
880882
(Decl (decl_adtype AutoDiffable) (decl_id sigma) (decl_type (Sized SReal))
881-
(initialize true)))
883+
(decl_annotations ()) (initialize true)))
882884
(meta <opaque>))
883885
((pattern
884886
(Assignment ((LVariable sigma) ()) UReal
@@ -906,7 +908,8 @@
906908
((out_unconstrained_st SReal) (out_constrained_st SReal) (out_block Parameters)
907909
(out_trans
908910
(Lower
909-
((pattern (Lit Int 0)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly))))))))
911+
((pattern (Lit Int 0)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly))))))
912+
(out_annotations ())))
910913
(alpha
911914
((begin_loc
912915
((filename simple_function.stan) (line_num 14) (col_num 2) (included_from ())))
@@ -915,7 +918,8 @@
915918
((out_unconstrained_st SReal) (out_constrained_st SReal) (out_block Parameters)
916919
(out_trans
917920
(Lower
918-
((pattern (Lit Int 0)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly))))))))
921+
((pattern (Lit Int 0)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly))))))
922+
(out_annotations ())))
919923
(sigma
920924
((begin_loc
921925
((filename simple_function.stan) (line_num 15) (col_num 2) (included_from ())))
@@ -924,5 +928,6 @@
924928
((out_unconstrained_st SReal) (out_constrained_st SReal) (out_block Parameters)
925929
(out_trans
926930
(Lower
927-
((pattern (Lit Int 0)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly))))))))))
931+
((pattern (Lit Int 0)) (meta ((type_ UInt) (loc <opaque>) (adlevel DataOnly))))))
932+
(out_annotations ())))))
928933
(prog_name simple_function_model) (prog_path simple_function.stan))

0 commit comments

Comments
 (0)