Merge branch 'master' into highprecision

nickbattle · Dec 11, 2023 · e369c43 · e369c43
2 parents 6307bec + 60a2fb3
commit e369c43
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/annotations/documentation/AnnotationGuide.odt b/annotations/documentation/AnnotationGuide.odt
diff --git a/annotations/documentation/AnnotationGuide.pdf b/annotations/documentation/AnnotationGuide.pdf
diff --git a/annotations/src/main/resources/vdmj.annotations b/annotations/src/main/resources/vdmj.annotations
@@ -0,0 +1,10 @@
+annotations.ast.ASTConjectureAnnotation
+annotations.ast.ASTDeadlineMetAnnotation
+annotations.ast.ASTNoPOGAnnotation
+annotations.ast.ASTOnFailAnnotation
+annotations.ast.ASTOverrideAnnotation
+annotations.ast.ASTPrintfAnnotation
+annotations.ast.ASTSeparateAnnotation
+annotations.ast.ASTSepRequireAnnotation
+annotations.ast.ASTTraceAnnotation
+annotations.ast.ASTWarningAnnotation
diff --git a/annotations2/src/main/resources/vdmj.annotations b/annotations2/src/main/resources/vdmj.annotations
@@ -0,0 +1,5 @@
+annotations.ast.ASTChangesAnnotation
+annotations.ast.ASTGhostAnnotation
+annotations.ast.ASTLimitAnnotation
+annotations.ast.ASTTestAnnotation
+annotations.ast.ASTWitnessAnnotation