From d4e6d894ca83e843e29c8d46d7d88b343881a658 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Fri, 6 Nov 2020 15:42:37 +0100 Subject: [PATCH 1/2] Update generator to new clang --- .../cached/Abstraction-implem-decl-after.hh | 26 +++--- .../main/cached/Abstraction-implem-decl.hh | 2 +- vm/boostenv/main/cached/Abstraction-implem.hh | 26 +++--- .../main/cached/Arity-implem-decl-after.hh | 16 ++-- vm/boostenv/main/cached/Arity-implem-decl.hh | 2 +- vm/boostenv/main/cached/Arity-implem.hh | 16 ++-- .../main/cached/Array-implem-decl-after.hh | 32 +++---- vm/boostenv/main/cached/Array-implem-decl.hh | 2 +- vm/boostenv/main/cached/Array-implem.hh | 32 +++---- vm/boostenv/main/cached/ArrayLike-interf.hh | 20 ++--- .../main/cached/Atom-implem-decl-after.hh | 42 ++++----- vm/boostenv/main/cached/Atom-implem-decl.hh | 2 +- vm/boostenv/main/cached/Atom-implem.hh | 40 ++++----- vm/boostenv/main/cached/AtomLike-interf.hh | 2 +- .../main/cached/BaseDottable-interf.hh | 4 +- .../main/cached/BigInt-implem-decl-after.hh | 30 +++---- vm/boostenv/main/cached/BigInt-implem.hh | 30 +++---- .../main/cached/BindableReadOnly-interf.hh | 2 +- .../main/cached/Boolean-implem-decl-after.hh | 38 ++++---- vm/boostenv/main/cached/Boolean-implem.hh | 38 ++++---- .../main/cached/BuiltinCallable-interf.hh | 8 +- .../BuiltinProcedure-implem-decl-after.hh | 26 +++--- .../main/cached/BuiltinProcedure-implem.hh | 26 +++--- .../cached/ByteString-implem-decl-after.hh | 30 +++---- vm/boostenv/main/cached/ByteString-implem.hh | 30 +++---- vm/boostenv/main/cached/Callable-interf.hh | 10 +-- .../main/cached/Cell-implem-decl-after.hh | 12 +-- vm/boostenv/main/cached/Cell-implem.hh | 12 +-- vm/boostenv/main/cached/CellLike-interf.hh | 12 +-- .../main/cached/Chunk-implem-decl-after.hh | 12 +-- vm/boostenv/main/cached/Chunk-implem-decl.hh | 2 +- vm/boostenv/main/cached/Chunk-implem.hh | 16 ++-- vm/boostenv/main/cached/ChunkLike-interf.hh | 2 +- .../main/cached/CodeArea-implem-decl-after.hh | 18 ++-- .../main/cached/CodeArea-implem-decl.hh | 2 +- vm/boostenv/main/cached/CodeArea-implem.hh | 18 ++-- .../main/cached/CodeAreaProvider-interf.hh | 6 +- vm/boostenv/main/cached/Comparable-interf.hh | 2 +- .../main/cached/Cons-implem-decl-after.hh | 38 ++++---- vm/boostenv/main/cached/Cons-implem.hh | 38 ++++---- .../main/cached/DataflowVariable-interf.hh | 8 +- .../cached/Dictionary-implem-decl-after.hh | 42 ++++----- vm/boostenv/main/cached/Dictionary-implem.hh | 42 ++++----- .../main/cached/DictionaryLike-interf.hh | 44 +++++----- .../main/cached/DotAssignable-interf.hh | 6 +- .../cached/FailedSpace-implem-decl-after.hh | 14 +-- .../main/cached/FailedSpace-implem-decl.hh | 2 +- vm/boostenv/main/cached/FailedSpace-implem.hh | 14 +-- .../cached/FailedValue-implem-decl-after.hh | 14 +-- .../main/cached/FailedValue-implem-decl.hh | 2 +- vm/boostenv/main/cached/FailedValue-implem.hh | 18 ++-- .../main/cached/Float-implem-decl-after.hh | 86 +++++++++--------- vm/boostenv/main/cached/Float-implem.hh | 86 +++++++++--------- vm/boostenv/main/cached/FloatLike-interf.hh | 88 +++++++++---------- .../cached/GRedToStable-implem-decl-after.hh | 2 +- .../main/cached/GRedToStable-implem-decl.hh | 2 +- .../main/cached/GRedToStable-implem.hh | 2 +- .../GRedToUnstable-implem-decl-after.hh | 2 +- .../main/cached/GRedToUnstable-implem-decl.hh | 2 +- .../main/cached/GRedToUnstable-implem.hh | 2 +- .../cached/GlobalName-implem-decl-after.hh | 38 ++++---- vm/boostenv/main/cached/GlobalName-implem.hh | 38 ++++---- vm/boostenv/main/cached/Literal-interf.hh | 2 +- .../cached/MergedSpace-implem-decl-after.hh | 14 +-- .../main/cached/MergedSpace-implem-decl.hh | 2 +- vm/boostenv/main/cached/MergedSpace-implem.hh | 14 +-- vm/boostenv/main/cached/NameLike-interf.hh | 2 +- .../cached/NamedName-implem-decl-after.hh | 42 ++++----- vm/boostenv/main/cached/NamedName-implem.hh | 42 ++++----- vm/boostenv/main/cached/Numeric-interf.hh | 38 ++++---- .../main/cached/Object-implem-decl-after.hh | 36 ++++---- vm/boostenv/main/cached/Object-implem-decl.hh | 2 +- vm/boostenv/main/cached/Object-implem.hh | 36 ++++---- vm/boostenv/main/cached/ObjectLike-interf.hh | 16 ++-- .../main/cached/OptName-implem-decl-after.hh | 36 ++++---- .../main/cached/OptName-implem-decl.hh | 2 +- vm/boostenv/main/cached/OptName-implem.hh | 36 ++++---- .../main/cached/OptVar-implem-decl-after.hh | 14 +-- vm/boostenv/main/cached/OptVar-implem-decl.hh | 2 +- vm/boostenv/main/cached/OptVar-implem.hh | 14 +-- .../cached/PatMatCapture-implem-decl-after.hh | 10 +-- .../main/cached/PatMatCapture-implem-decl.hh | 2 +- .../main/cached/PatMatCapture-implem.hh | 8 +- .../PatMatConjunction-implem-decl-after.hh | 12 +-- .../cached/PatMatConjunction-implem-decl.hh | 2 +- .../main/cached/PatMatConjunction-implem.hh | 12 +-- .../PatMatOpenRecord-implem-decl-after.hh | 12 +-- .../cached/PatMatOpenRecord-implem-decl.hh | 2 +- .../main/cached/PatMatOpenRecord-implem.hh | 12 +-- .../main/cached/Port-implem-decl-after.hh | 10 +-- vm/boostenv/main/cached/Port-implem.hh | 10 +-- vm/boostenv/main/cached/PortLike-interf.hh | 8 +- .../main/cached/PotentialFeature-interf.hh | 2 +- .../main/cached/ReadOnly-implem-decl-after.hh | 16 ++-- .../main/cached/ReadOnly-implem-decl.hh | 2 +- vm/boostenv/main/cached/ReadOnly-implem.hh | 20 ++--- .../ReadOnlyVariable-implem-decl-after.hh | 14 +-- .../main/cached/ReadOnlyVariable-implem.hh | 14 +-- .../main/cached/Record-implem-decl-after.hh | 38 ++++---- vm/boostenv/main/cached/Record-implem-decl.hh | 2 +- vm/boostenv/main/cached/Record-implem.hh | 38 ++++---- vm/boostenv/main/cached/RecordLike-interf.hh | 20 ++--- .../cached/Reference-implem-decl-after.hh | 4 +- .../main/cached/Reference-implem-decl.hh | 2 +- vm/boostenv/main/cached/Reference-implem.hh | 10 +-- .../ReflectiveEntity-implem-decl-after.hh | 4 +- .../main/cached/ReflectiveEntity-implem.hh | 4 +- .../ReflectiveVariable-implem-decl-after.hh | 16 ++-- .../main/cached/ReflectiveVariable-implem.hh | 16 ++-- .../cached/ReifiedGNode-implem-decl-after.hh | 6 +- .../main/cached/ReifiedGNode-implem-decl.hh | 2 +- .../main/cached/ReifiedGNode-implem.hh | 4 +- .../cached/ReifiedSpace-implem-decl-after.hh | 18 ++-- .../main/cached/ReifiedSpace-implem-decl.hh | 2 +- .../main/cached/ReifiedSpace-implem.hh | 18 ++-- .../cached/ReifiedThread-implem-decl-after.hh | 18 ++-- .../main/cached/ReifiedThread-implem-decl.hh | 2 +- .../main/cached/ReifiedThread-implem.hh | 24 +++-- .../cached/Serialized-implem-decl-after.hh | 2 +- .../main/cached/Serialized-implem-decl.hh | 2 +- vm/boostenv/main/cached/Serialized-implem.hh | 2 +- .../cached/Serializer-implem-decl-after.hh | 2 +- vm/boostenv/main/cached/Serializer-implem.hh | 2 +- .../main/cached/SmallInt-implem-decl-after.hh | 42 ++++----- .../main/cached/SmallInt-implem-decl.hh | 2 +- vm/boostenv/main/cached/SmallInt-implem.hh | 40 ++++----- vm/boostenv/main/cached/SpaceLike-interf.hh | 14 +-- .../main/cached/String-implem-decl-after.hh | 30 +++---- vm/boostenv/main/cached/String-implem.hh | 30 +++---- vm/boostenv/main/cached/StringLike-interf.hh | 20 ++--- .../main/cached/StructuralEquatable-interf.hh | 2 +- vm/boostenv/main/cached/ThreadLike-interf.hh | 8 +- .../main/cached/Tuple-implem-decl-after.hh | 40 ++++----- vm/boostenv/main/cached/Tuple-implem-decl.hh | 2 +- vm/boostenv/main/cached/Tuple-implem.hh | 40 ++++----- .../cached/UniqueName-implem-decl-after.hh | 42 ++++----- .../main/cached/UniqueName-implem-decl.hh | 2 +- vm/boostenv/main/cached/UniqueName-implem.hh | 40 ++++----- .../main/cached/Unit-implem-decl-after.hh | 40 ++++----- vm/boostenv/main/cached/Unit-implem-decl.hh | 2 +- vm/boostenv/main/cached/Unit-implem.hh | 38 ++++---- .../main/cached/VMPort-implem-decl-after.hh | 14 +-- vm/boostenv/main/cached/VMPort-implem-decl.hh | 2 +- vm/boostenv/main/cached/VMPort-implem.hh | 12 +-- .../main/cached/ValueEquatable-interf.hh | 2 +- .../main/cached/Variable-implem-decl-after.hh | 16 ++-- vm/boostenv/main/cached/Variable-implem.hh | 16 ++-- vm/boostenv/main/cached/Wakeable-interf.hh | 4 +- .../cached/WeakReference-implem-decl-after.hh | 2 +- .../main/cached/WeakReference-implem-decl.hh | 2 +- .../main/cached/WeakReference-implem.hh | 6 +- .../main/cached/WithPrintName-interf.hh | 4 +- vm/generator/main/builtins.cc | 8 +- vm/generator/main/generator.cc | 1 + .../cached/Abstraction-implem-decl-after.hh | 26 +++--- vm/vm/main/cached/Abstraction-implem-decl.hh | 2 +- vm/vm/main/cached/Abstraction-implem.hh | 26 +++--- vm/vm/main/cached/Arity-implem-decl-after.hh | 16 ++-- vm/vm/main/cached/Arity-implem-decl.hh | 2 +- vm/vm/main/cached/Arity-implem.hh | 16 ++-- vm/vm/main/cached/Array-implem-decl-after.hh | 32 +++---- vm/vm/main/cached/Array-implem-decl.hh | 2 +- vm/vm/main/cached/Array-implem.hh | 32 +++---- vm/vm/main/cached/ArrayLike-interf.hh | 20 ++--- vm/vm/main/cached/Atom-implem-decl-after.hh | 42 ++++----- vm/vm/main/cached/Atom-implem-decl.hh | 2 +- vm/vm/main/cached/Atom-implem.hh | 40 ++++----- vm/vm/main/cached/AtomLike-interf.hh | 2 +- vm/vm/main/cached/BaseDottable-interf.hh | 4 +- vm/vm/main/cached/BigInt-implem-decl-after.hh | 30 +++---- vm/vm/main/cached/BigInt-implem.hh | 30 +++---- vm/vm/main/cached/BindableReadOnly-interf.hh | 2 +- .../main/cached/Boolean-implem-decl-after.hh | 38 ++++---- vm/vm/main/cached/Boolean-implem.hh | 38 ++++---- vm/vm/main/cached/BuiltinCallable-interf.hh | 8 +- .../BuiltinProcedure-implem-decl-after.hh | 26 +++--- vm/vm/main/cached/BuiltinProcedure-implem.hh | 26 +++--- .../cached/ByteString-implem-decl-after.hh | 30 +++---- vm/vm/main/cached/ByteString-implem.hh | 30 +++---- vm/vm/main/cached/Callable-interf.hh | 10 +-- vm/vm/main/cached/Cell-implem-decl-after.hh | 12 +-- vm/vm/main/cached/Cell-implem.hh | 12 +-- vm/vm/main/cached/CellLike-interf.hh | 12 +-- vm/vm/main/cached/Chunk-implem-decl-after.hh | 12 +-- vm/vm/main/cached/Chunk-implem-decl.hh | 2 +- vm/vm/main/cached/Chunk-implem.hh | 16 ++-- vm/vm/main/cached/ChunkLike-interf.hh | 2 +- .../main/cached/CodeArea-implem-decl-after.hh | 18 ++-- vm/vm/main/cached/CodeArea-implem-decl.hh | 2 +- vm/vm/main/cached/CodeArea-implem.hh | 18 ++-- vm/vm/main/cached/CodeAreaProvider-interf.hh | 6 +- vm/vm/main/cached/Comparable-interf.hh | 2 +- vm/vm/main/cached/Cons-implem-decl-after.hh | 38 ++++---- vm/vm/main/cached/Cons-implem.hh | 38 ++++---- vm/vm/main/cached/DataflowVariable-interf.hh | 8 +- .../cached/Dictionary-implem-decl-after.hh | 42 ++++----- vm/vm/main/cached/Dictionary-implem.hh | 42 ++++----- vm/vm/main/cached/DictionaryLike-interf.hh | 44 +++++----- vm/vm/main/cached/DotAssignable-interf.hh | 6 +- .../cached/FailedSpace-implem-decl-after.hh | 14 +-- vm/vm/main/cached/FailedSpace-implem-decl.hh | 2 +- vm/vm/main/cached/FailedSpace-implem.hh | 14 +-- .../cached/FailedValue-implem-decl-after.hh | 14 +-- vm/vm/main/cached/FailedValue-implem-decl.hh | 2 +- vm/vm/main/cached/FailedValue-implem.hh | 18 ++-- vm/vm/main/cached/Float-implem-decl-after.hh | 86 +++++++++--------- vm/vm/main/cached/Float-implem.hh | 86 +++++++++--------- vm/vm/main/cached/FloatLike-interf.hh | 88 +++++++++---------- .../cached/GRedToStable-implem-decl-after.hh | 2 +- vm/vm/main/cached/GRedToStable-implem-decl.hh | 2 +- vm/vm/main/cached/GRedToStable-implem.hh | 2 +- .../GRedToUnstable-implem-decl-after.hh | 2 +- .../main/cached/GRedToUnstable-implem-decl.hh | 2 +- vm/vm/main/cached/GRedToUnstable-implem.hh | 2 +- .../cached/GlobalName-implem-decl-after.hh | 38 ++++---- vm/vm/main/cached/GlobalName-implem.hh | 38 ++++---- vm/vm/main/cached/Literal-interf.hh | 2 +- .../cached/MergedSpace-implem-decl-after.hh | 14 +-- vm/vm/main/cached/MergedSpace-implem-decl.hh | 2 +- vm/vm/main/cached/MergedSpace-implem.hh | 14 +-- vm/vm/main/cached/NameLike-interf.hh | 2 +- .../cached/NamedName-implem-decl-after.hh | 42 ++++----- vm/vm/main/cached/NamedName-implem.hh | 42 ++++----- vm/vm/main/cached/Numeric-interf.hh | 38 ++++---- vm/vm/main/cached/Object-implem-decl-after.hh | 36 ++++---- vm/vm/main/cached/Object-implem-decl.hh | 2 +- vm/vm/main/cached/Object-implem.hh | 36 ++++---- vm/vm/main/cached/ObjectLike-interf.hh | 16 ++-- .../main/cached/OptName-implem-decl-after.hh | 36 ++++---- vm/vm/main/cached/OptName-implem-decl.hh | 2 +- vm/vm/main/cached/OptName-implem.hh | 36 ++++---- vm/vm/main/cached/OptVar-implem-decl-after.hh | 14 +-- vm/vm/main/cached/OptVar-implem-decl.hh | 2 +- vm/vm/main/cached/OptVar-implem.hh | 14 +-- .../cached/PatMatCapture-implem-decl-after.hh | 10 +-- .../main/cached/PatMatCapture-implem-decl.hh | 2 +- vm/vm/main/cached/PatMatCapture-implem.hh | 8 +- .../PatMatConjunction-implem-decl-after.hh | 12 +-- .../cached/PatMatConjunction-implem-decl.hh | 2 +- vm/vm/main/cached/PatMatConjunction-implem.hh | 12 +-- .../PatMatOpenRecord-implem-decl-after.hh | 12 +-- .../cached/PatMatOpenRecord-implem-decl.hh | 2 +- vm/vm/main/cached/PatMatOpenRecord-implem.hh | 12 +-- vm/vm/main/cached/Port-implem-decl-after.hh | 10 +-- vm/vm/main/cached/Port-implem.hh | 10 +-- vm/vm/main/cached/PortLike-interf.hh | 8 +- vm/vm/main/cached/PotentialFeature-interf.hh | 2 +- .../main/cached/ReadOnly-implem-decl-after.hh | 16 ++-- vm/vm/main/cached/ReadOnly-implem-decl.hh | 2 +- vm/vm/main/cached/ReadOnly-implem.hh | 20 ++--- .../ReadOnlyVariable-implem-decl-after.hh | 14 +-- vm/vm/main/cached/ReadOnlyVariable-implem.hh | 14 +-- vm/vm/main/cached/Record-implem-decl-after.hh | 38 ++++---- vm/vm/main/cached/Record-implem-decl.hh | 2 +- vm/vm/main/cached/Record-implem.hh | 38 ++++---- vm/vm/main/cached/RecordLike-interf.hh | 20 ++--- .../cached/Reference-implem-decl-after.hh | 4 +- vm/vm/main/cached/Reference-implem-decl.hh | 2 +- vm/vm/main/cached/Reference-implem.hh | 10 +-- .../ReflectiveEntity-implem-decl-after.hh | 4 +- vm/vm/main/cached/ReflectiveEntity-implem.hh | 4 +- .../ReflectiveVariable-implem-decl-after.hh | 16 ++-- .../main/cached/ReflectiveVariable-implem.hh | 16 ++-- .../cached/ReifiedGNode-implem-decl-after.hh | 6 +- vm/vm/main/cached/ReifiedGNode-implem-decl.hh | 2 +- vm/vm/main/cached/ReifiedGNode-implem.hh | 4 +- .../cached/ReifiedSpace-implem-decl-after.hh | 18 ++-- vm/vm/main/cached/ReifiedSpace-implem-decl.hh | 2 +- vm/vm/main/cached/ReifiedSpace-implem.hh | 18 ++-- .../cached/ReifiedThread-implem-decl-after.hh | 18 ++-- .../main/cached/ReifiedThread-implem-decl.hh | 2 +- vm/vm/main/cached/ReifiedThread-implem.hh | 24 +++-- .../cached/Serialized-implem-decl-after.hh | 2 +- vm/vm/main/cached/Serialized-implem-decl.hh | 2 +- vm/vm/main/cached/Serialized-implem.hh | 2 +- .../cached/Serializer-implem-decl-after.hh | 2 +- vm/vm/main/cached/Serializer-implem.hh | 2 +- .../main/cached/SmallInt-implem-decl-after.hh | 42 ++++----- vm/vm/main/cached/SmallInt-implem-decl.hh | 2 +- vm/vm/main/cached/SmallInt-implem.hh | 40 ++++----- vm/vm/main/cached/SpaceLike-interf.hh | 14 +-- vm/vm/main/cached/String-implem-decl-after.hh | 30 +++---- vm/vm/main/cached/String-implem.hh | 30 +++---- vm/vm/main/cached/StringLike-interf.hh | 20 ++--- .../main/cached/StructuralEquatable-interf.hh | 2 +- vm/vm/main/cached/ThreadLike-interf.hh | 8 +- vm/vm/main/cached/Tuple-implem-decl-after.hh | 40 ++++----- vm/vm/main/cached/Tuple-implem-decl.hh | 2 +- vm/vm/main/cached/Tuple-implem.hh | 40 ++++----- .../cached/UniqueName-implem-decl-after.hh | 42 ++++----- vm/vm/main/cached/UniqueName-implem-decl.hh | 2 +- vm/vm/main/cached/UniqueName-implem.hh | 40 ++++----- vm/vm/main/cached/Unit-implem-decl-after.hh | 40 ++++----- vm/vm/main/cached/Unit-implem-decl.hh | 2 +- vm/vm/main/cached/Unit-implem.hh | 38 ++++---- vm/vm/main/cached/VMPort-implem-decl-after.hh | 14 +-- vm/vm/main/cached/VMPort-implem-decl.hh | 2 +- vm/vm/main/cached/VMPort-implem.hh | 12 +-- vm/vm/main/cached/ValueEquatable-interf.hh | 2 +- .../main/cached/Variable-implem-decl-after.hh | 16 ++-- vm/vm/main/cached/Variable-implem.hh | 16 ++-- vm/vm/main/cached/Wakeable-interf.hh | 4 +- .../cached/WeakReference-implem-decl-after.hh | 2 +- .../main/cached/WeakReference-implem-decl.hh | 2 +- vm/vm/main/cached/WeakReference-implem.hh | 6 +- vm/vm/main/cached/WithPrintName-interf.hh | 4 +- 306 files changed, 2556 insertions(+), 2585 deletions(-) diff --git a/vm/boostenv/main/cached/Abstraction-implem-decl-after.hh b/vm/boostenv/main/cached/Abstraction-implem-decl-after.hh index f1e5c94d2..b4c4994a7 100644 --- a/vm/boostenv/main/cached/Abstraction-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Abstraction-implem-decl-after.hh @@ -51,44 +51,44 @@ public: size_t getArraySize(); inline - StaticArray getElementsArray(); + StaticArray getElementsArray(); inline - class mozart::StableNode& getElements(size_t i); + mozart::StableNode& getElements(size_t i); inline - class mozart::Space * home(); + mozart::Space * home(); inline size_t getArraySizeImpl(); inline - atom_t getPrintName(VM vm); + mozart::atom_t getPrintName(mozart::VM vm); inline - bool isCallable(VM vm); + bool isCallable(mozart::VM vm); inline - bool isProcedure(VM vm); + bool isProcedure(mozart::VM vm); inline - size_t procedureArity(VM vm); + size_t procedureArity(mozart::VM vm); inline - void getCallInfo(VM vm, size_t & arity, ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks); + void getCallInfo(mozart::VM vm, size_t & arity, mozart::ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks); inline - void getDebugInfo(VM vm, atom_t & printName, class mozart::UnstableNode & debugData); + void getDebugInfo(mozart::VM vm, mozart::atom_t & printName, mozart::UnstableNode & debugData); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); inline - class mozart::GlobalNode * globalize(VM vm); + mozart::GlobalNode * globalize(mozart::VM vm); inline - void setUUID(VM vm, const struct mozart::UUID & uuid); + void setUUID(mozart::VM vm, const mozart::UUID & uuid); }; diff --git a/vm/boostenv/main/cached/Abstraction-implem-decl.hh b/vm/boostenv/main/cached/Abstraction-implem-decl.hh index 5253c6a09..2ee7301e8 100644 --- a/vm/boostenv/main/cached/Abstraction-implem-decl.hh +++ b/vm/boostenv/main/cached/Abstraction-implem-decl.hh @@ -3,5 +3,5 @@ class Abstraction; template <> class Storage { public: - typedef ImplWithArray Type; + typedef ImplWithArray Type; }; diff --git a/vm/boostenv/main/cached/Abstraction-implem.hh b/vm/boostenv/main/cached/Abstraction-implem.hh index 737474ce8..87fe9ffba 100644 --- a/vm/boostenv/main/cached/Abstraction-implem.hh +++ b/vm/boostenv/main/cached/Abstraction-implem.hh @@ -47,16 +47,16 @@ size_t TypedRichNode::getArraySize() { return _self.access().getArraySize(); } -StaticArray TypedRichNode::getElementsArray() { +StaticArray TypedRichNode::getElementsArray() { return _self.access().getElementsArray(); } -class mozart::StableNode& TypedRichNode::getElements(size_t i) { +mozart::StableNode& TypedRichNode::getElements(size_t i) { return _self.access().getElements(i); } inline -class mozart::Space * TypedRichNode::home() { +mozart::Space * TypedRichNode::home() { return _self.access().home(); } @@ -66,51 +66,51 @@ size_t TypedRichNode::getArraySizeImpl() { } inline -atom_t TypedRichNode::getPrintName(VM vm) { +mozart::atom_t TypedRichNode::getPrintName(mozart::VM vm) { return _self.access().getPrintName(vm); } inline -bool TypedRichNode::isCallable(VM vm) { +bool TypedRichNode::isCallable(mozart::VM vm) { return _self.access().isCallable(vm); } inline -bool TypedRichNode::isProcedure(VM vm) { +bool TypedRichNode::isProcedure(mozart::VM vm) { return _self.access().isProcedure(vm); } inline -size_t TypedRichNode::procedureArity(VM vm) { +size_t TypedRichNode::procedureArity(mozart::VM vm) { return _self.access().procedureArity(vm); } inline -void TypedRichNode::getCallInfo(VM vm, size_t & arity, ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks) { +void TypedRichNode::getCallInfo(mozart::VM vm, size_t & arity, mozart::ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks) { _self.access().getCallInfo(vm, arity, start, Xcount, Gs, Ks); } inline -void TypedRichNode::getDebugInfo(VM vm, atom_t & printName, class mozart::UnstableNode & debugData) { +void TypedRichNode::getDebugInfo(mozart::VM vm, mozart::atom_t & printName, mozart::UnstableNode & debugData) { _self.access().getDebugInfo(vm, printName, debugData); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } inline -class mozart::GlobalNode * TypedRichNode::globalize(VM vm) { +mozart::GlobalNode * TypedRichNode::globalize(mozart::VM vm) { return _self.access().globalize(_self, vm); } inline -void TypedRichNode::setUUID(VM vm, const struct mozart::UUID & uuid) { +void TypedRichNode::setUUID(mozart::VM vm, const mozart::UUID & uuid) { _self.access().setUUID(_self, vm, uuid); } diff --git a/vm/boostenv/main/cached/Arity-implem-decl-after.hh b/vm/boostenv/main/cached/Arity-implem-decl-after.hh index d7b8bc912..bd95ec320 100644 --- a/vm/boostenv/main/cached/Arity-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Arity-implem-decl-after.hh @@ -48,32 +48,32 @@ public: size_t getArraySize(); inline - StaticArray getElementsArray(); + StaticArray getElementsArray(); inline - class mozart::StableNode& getElements(size_t i); + mozart::StableNode& getElements(size_t i); inline size_t getArraySizeImpl(); inline - class mozart::StableNode * getLabel(); + mozart::StableNode * getLabel(); inline size_t getWidth(); inline - class mozart::StableNode * getElement(size_t index); + mozart::StableNode * getElement(size_t index); inline - bool equals(VM vm, class mozart::RichNode right, class mozart::WalkStack & stack); + bool equals(mozart::VM vm, mozart::RichNode right, mozart::WalkStack & stack); inline - bool lookupFeature(VM vm, class mozart::RichNode feature, size_t & offset); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, size_t & offset); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); }; diff --git a/vm/boostenv/main/cached/Arity-implem-decl.hh b/vm/boostenv/main/cached/Arity-implem-decl.hh index 593265840..0cb720eae 100644 --- a/vm/boostenv/main/cached/Arity-implem-decl.hh +++ b/vm/boostenv/main/cached/Arity-implem-decl.hh @@ -3,5 +3,5 @@ class Arity; template <> class Storage { public: - typedef ImplWithArray Type; + typedef ImplWithArray Type; }; diff --git a/vm/boostenv/main/cached/Arity-implem.hh b/vm/boostenv/main/cached/Arity-implem.hh index 72f71a9dc..a59488bb4 100644 --- a/vm/boostenv/main/cached/Arity-implem.hh +++ b/vm/boostenv/main/cached/Arity-implem.hh @@ -34,11 +34,11 @@ size_t TypedRichNode::getArraySize() { return _self.access().getArraySize(); } -StaticArray TypedRichNode::getElementsArray() { +StaticArray TypedRichNode::getElementsArray() { return _self.access().getElementsArray(); } -class mozart::StableNode& TypedRichNode::getElements(size_t i) { +mozart::StableNode& TypedRichNode::getElements(size_t i) { return _self.access().getElements(i); } @@ -48,7 +48,7 @@ size_t TypedRichNode::getArraySizeImpl() { } inline -class mozart::StableNode * TypedRichNode::getLabel() { +mozart::StableNode * TypedRichNode::getLabel() { return _self.access().getLabel(); } @@ -58,26 +58,26 @@ size_t TypedRichNode::getWidth() { } inline -class mozart::StableNode * TypedRichNode::getElement(size_t index) { +mozart::StableNode * TypedRichNode::getElement(size_t index) { return _self.access().getElement(index); } inline -bool TypedRichNode::equals(VM vm, class mozart::RichNode right, class mozart::WalkStack & stack) { +bool TypedRichNode::equals(mozart::VM vm, mozart::RichNode right, mozart::WalkStack & stack) { return _self.access().equals(vm, right, stack); } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, size_t & offset) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, size_t & offset) { return _self.access().lookupFeature(vm, feature, offset); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } diff --git a/vm/boostenv/main/cached/Array-implem-decl-after.hh b/vm/boostenv/main/cached/Array-implem-decl-after.hh index 087d435fb..ea0066def 100644 --- a/vm/boostenv/main/cached/Array-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Array-implem-decl-after.hh @@ -45,19 +45,19 @@ public: size_t getArraySize(); inline - StaticArray getElementsArray(); + StaticArray getElementsArray(); inline - class mozart::UnstableNode& getElements(size_t i); + mozart::UnstableNode& getElements(size_t i); inline - class mozart::Space * home(); + mozart::Space * home(); inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline size_t getArraySizeImpl(); @@ -66,35 +66,35 @@ public: size_t getWidth(); inline - nativeint getLow(); + mozart::nativeint getLow(); inline - nativeint getHigh(); + mozart::nativeint getHigh(); inline - void dotAssign(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue); + void dotAssign(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue); inline - class mozart::UnstableNode dotExchange(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue); + mozart::UnstableNode dotExchange(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue); inline - bool isArray(VM vm); + bool isArray(mozart::VM vm); inline - class mozart::UnstableNode arrayLow(VM vm); + mozart::UnstableNode arrayLow(mozart::VM vm); inline - class mozart::UnstableNode arrayHigh(VM vm); + mozart::UnstableNode arrayHigh(mozart::VM vm); inline - class mozart::UnstableNode arrayGet(VM vm, class mozart::RichNode index); + mozart::UnstableNode arrayGet(mozart::VM vm, mozart::RichNode index); inline - void arrayPut(VM vm, class mozart::RichNode index, class mozart::RichNode value); + void arrayPut(mozart::VM vm, mozart::RichNode index, mozart::RichNode value); inline - class mozart::UnstableNode arrayExchange(VM vm, class mozart::RichNode index, class mozart::RichNode newValue); + mozart::UnstableNode arrayExchange(mozart::VM vm, mozart::RichNode index, mozart::RichNode newValue); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/Array-implem-decl.hh b/vm/boostenv/main/cached/Array-implem-decl.hh index 8f404ef0c..2261a660b 100644 --- a/vm/boostenv/main/cached/Array-implem-decl.hh +++ b/vm/boostenv/main/cached/Array-implem-decl.hh @@ -3,5 +3,5 @@ class Array; template <> class Storage { public: - typedef ImplWithArray Type; + typedef ImplWithArray Type; }; diff --git a/vm/boostenv/main/cached/Array-implem.hh b/vm/boostenv/main/cached/Array-implem.hh index 44aee40ce..b31ba7d4e 100644 --- a/vm/boostenv/main/cached/Array-implem.hh +++ b/vm/boostenv/main/cached/Array-implem.hh @@ -37,26 +37,26 @@ size_t TypedRichNode::getArraySize() { return _self.access().getArraySize(); } -StaticArray TypedRichNode::getElementsArray() { +StaticArray TypedRichNode::getElementsArray() { return _self.access().getElementsArray(); } -class mozart::UnstableNode& TypedRichNode::getElements(size_t i) { +mozart::UnstableNode& TypedRichNode::getElements(size_t i) { return _self.access().getElements(i); } inline -class mozart::Space * TypedRichNode::home() { +mozart::Space * TypedRichNode::home() { return _self.access().home(); } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } @@ -71,56 +71,56 @@ size_t TypedRichNode::getWidth() { } inline -nativeint TypedRichNode::getLow() { +mozart::nativeint TypedRichNode::getLow() { return _self.access().getLow(); } inline -nativeint TypedRichNode::getHigh() { +mozart::nativeint TypedRichNode::getHigh() { return _self.access().getHigh(); } inline -void TypedRichNode::dotAssign(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue) { +void TypedRichNode::dotAssign(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue) { _self.access().dotAssign(_self, vm, feature, newValue); } inline -class mozart::UnstableNode TypedRichNode::dotExchange(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue) { +mozart::UnstableNode TypedRichNode::dotExchange(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue) { return _self.access().dotExchange(_self, vm, feature, newValue); } inline -bool TypedRichNode::isArray(VM vm) { +bool TypedRichNode::isArray(mozart::VM vm) { return _self.access().isArray(vm); } inline -class mozart::UnstableNode TypedRichNode::arrayLow(VM vm) { +mozart::UnstableNode TypedRichNode::arrayLow(mozart::VM vm) { return _self.access().arrayLow(vm); } inline -class mozart::UnstableNode TypedRichNode::arrayHigh(VM vm) { +mozart::UnstableNode TypedRichNode::arrayHigh(mozart::VM vm) { return _self.access().arrayHigh(vm); } inline -class mozart::UnstableNode TypedRichNode::arrayGet(VM vm, class mozart::RichNode index) { +mozart::UnstableNode TypedRichNode::arrayGet(mozart::VM vm, mozart::RichNode index) { return _self.access().arrayGet(_self, vm, index); } inline -void TypedRichNode::arrayPut(VM vm, class mozart::RichNode index, class mozart::RichNode value) { +void TypedRichNode::arrayPut(mozart::VM vm, mozart::RichNode index, mozart::RichNode value) { _self.access().arrayPut(_self, vm, index, value); } inline -class mozart::UnstableNode TypedRichNode::arrayExchange(VM vm, class mozart::RichNode index, class mozart::RichNode newValue) { +mozart::UnstableNode TypedRichNode::arrayExchange(mozart::VM vm, mozart::RichNode index, mozart::RichNode newValue) { return _self.access().arrayExchange(_self, vm, index, newValue); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/ArrayLike-interf.hh b/vm/boostenv/main/cached/ArrayLike-interf.hh index 8cb1a58c8..ddc0c15e0 100644 --- a/vm/boostenv/main/cached/ArrayLike-interf.hh +++ b/vm/boostenv/main/cached/ArrayLike-interf.hh @@ -4,7 +4,7 @@ public: ArrayLike(UnstableNode& self) : _self(self) {} ArrayLike(StableNode& self) : _self(self) {} - bool isArray(VM vm) { + bool isArray(mozart::VM vm) { if (_self.is()) { return _self.as().isArray(vm); } else if (_self.isTransient()) { @@ -20,7 +20,7 @@ public: } } - class mozart::UnstableNode arrayLow(VM vm) { + mozart::UnstableNode arrayLow(mozart::VM vm) { if (_self.is()) { return _self.as().arrayLow(vm); } else if (_self.isTransient()) { @@ -28,7 +28,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::ArrayLike::arrayLow", "arrayLow", ::mozart::ozcalls::out(_result))) return _result; } @@ -36,7 +36,7 @@ public: } } - class mozart::UnstableNode arrayHigh(VM vm) { + mozart::UnstableNode arrayHigh(mozart::VM vm) { if (_self.is()) { return _self.as().arrayHigh(vm); } else if (_self.isTransient()) { @@ -44,7 +44,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::ArrayLike::arrayHigh", "arrayHigh", ::mozart::ozcalls::out(_result))) return _result; } @@ -52,7 +52,7 @@ public: } } - class mozart::UnstableNode arrayGet(VM vm, class mozart::RichNode index) { + mozart::UnstableNode arrayGet(mozart::VM vm, mozart::RichNode index) { if (_self.is()) { return _self.as().arrayGet(vm, index); } else if (_self.isTransient()) { @@ -60,7 +60,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::ArrayLike::arrayGet", "arrayGet", index, ::mozart::ozcalls::out(_result))) return _result; } @@ -68,7 +68,7 @@ public: } } - void arrayPut(VM vm, class mozart::RichNode index, class mozart::RichNode value) { + void arrayPut(mozart::VM vm, mozart::RichNode index, mozart::RichNode value) { if (_self.is()) { return _self.as().arrayPut(vm, index, value); } else if (_self.isTransient()) { @@ -83,7 +83,7 @@ public: } } - class mozart::UnstableNode arrayExchange(VM vm, class mozart::RichNode index, class mozart::RichNode newValue) { + mozart::UnstableNode arrayExchange(mozart::VM vm, mozart::RichNode index, mozart::RichNode newValue) { if (_self.is()) { return _self.as().arrayExchange(vm, index, newValue); } else if (_self.isTransient()) { @@ -91,7 +91,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::ArrayLike::arrayExchange", "arrayExchange", index, newValue, ::mozart::ozcalls::out(_result))) return _result; } diff --git a/vm/boostenv/main/cached/Atom-implem-decl-after.hh b/vm/boostenv/main/cached/Atom-implem-decl-after.hh index e23cdf9da..eb584aed1 100644 --- a/vm/boostenv/main/cached/Atom-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Atom-implem-decl-after.hh @@ -5,7 +5,7 @@ class TypeInfoOf: public TypeInfo { return Atom::uuid; } public: - TypeInfoOf() : TypeInfo("Atom", uuid(), (! ::mozart::MemWord::requiresExternalMemory()), false, true, sbValue, 0) {} + TypeInfoOf() : TypeInfo("Atom", uuid(), (! ::mozart::MemWord::requiresExternalMemory()), false, true, sbValue, 0) {} static const TypeInfoOf* const instance() { return &RawType::rawType; @@ -45,62 +45,62 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - bool isLiteral(VM vm); + bool isLiteral(mozart::VM vm); inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline - bool isRecord(VM vm); + bool isRecord(mozart::VM vm); inline - bool isTuple(VM vm); + bool isTuple(mozart::VM vm); inline - class mozart::UnstableNode label(VM vm); + mozart::UnstableNode label(mozart::VM vm); inline - size_t width(VM vm); + size_t width(mozart::VM vm); inline - class mozart::UnstableNode arityList(VM vm); + mozart::UnstableNode arityList(mozart::VM vm); inline - class mozart::UnstableNode clone(VM vm); + mozart::UnstableNode clone(mozart::VM vm); inline - class mozart::UnstableNode waitOr(VM vm); + mozart::UnstableNode waitOr(mozart::VM vm); inline - bool testRecord(VM vm, class mozart::RichNode arity); + bool testRecord(mozart::VM vm, mozart::RichNode arity); inline - bool testTuple(VM vm, class mozart::RichNode label, size_t width); + bool testTuple(mozart::VM vm, mozart::RichNode label, size_t width); inline - bool testLabel(VM vm, class mozart::RichNode label); + bool testLabel(mozart::VM vm, mozart::RichNode label); inline - atom_t value(); + mozart::atom_t value(); inline - bool equals(VM vm, class mozart::RichNode right); + bool equals(mozart::VM vm, mozart::RichNode right); inline - int compareFeatures(VM vm, class mozart::RichNode right); + int compareFeatures(mozart::VM vm, mozart::RichNode right); inline - atom_t getPrintName(VM vm); + mozart::atom_t getPrintName(mozart::VM vm); inline - bool isAtom(VM vm); + bool isAtom(mozart::VM vm); inline - int compare(VM vm, class mozart::RichNode right); + int compare(mozart::VM vm, mozart::RichNode right); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/Atom-implem-decl.hh b/vm/boostenv/main/cached/Atom-implem-decl.hh index 6d1f61198..fb03ec7ab 100644 --- a/vm/boostenv/main/cached/Atom-implem-decl.hh +++ b/vm/boostenv/main/cached/Atom-implem-decl.hh @@ -3,5 +3,5 @@ class Atom; template <> class Storage { public: - typedef atom_t Type; + typedef mozart::atom_t Type; }; diff --git a/vm/boostenv/main/cached/Atom-implem.hh b/vm/boostenv/main/cached/Atom-implem.hh index 9a0fe772e..bbcbed493 100644 --- a/vm/boostenv/main/cached/Atom-implem.hh +++ b/vm/boostenv/main/cached/Atom-implem.hh @@ -31,101 +31,101 @@ int TypeInfoOf::compareFeatures(VM vm, RichNode lhs, RichNode rhs) const { inline -bool TypedRichNode::isLiteral(VM vm) { +bool TypedRichNode::isLiteral(mozart::VM vm) { return _self.access().isLiteral(vm); } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::isRecord(VM vm) { +bool TypedRichNode::isRecord(mozart::VM vm) { return _self.access().isRecord(vm); } inline -bool TypedRichNode::isTuple(VM vm) { +bool TypedRichNode::isTuple(mozart::VM vm) { return _self.access().isTuple(vm); } inline -class mozart::UnstableNode TypedRichNode::label(VM vm) { +mozart::UnstableNode TypedRichNode::label(mozart::VM vm) { return _self.access().label(_self, vm); } inline -size_t TypedRichNode::width(VM vm) { +size_t TypedRichNode::width(mozart::VM vm) { return _self.access().width(vm); } inline -class mozart::UnstableNode TypedRichNode::arityList(VM vm) { +mozart::UnstableNode TypedRichNode::arityList(mozart::VM vm) { return _self.access().arityList(vm); } inline -class mozart::UnstableNode TypedRichNode::clone(VM vm) { +mozart::UnstableNode TypedRichNode::clone(mozart::VM vm) { return _self.access().clone(_self, vm); } inline -class mozart::UnstableNode TypedRichNode::waitOr(VM vm) { +mozart::UnstableNode TypedRichNode::waitOr(mozart::VM vm) { return _self.access().waitOr(vm); } inline -bool TypedRichNode::testRecord(VM vm, class mozart::RichNode arity) { +bool TypedRichNode::testRecord(mozart::VM vm, mozart::RichNode arity) { return _self.access().testRecord(vm, arity); } inline -bool TypedRichNode::testTuple(VM vm, class mozart::RichNode label, size_t width) { +bool TypedRichNode::testTuple(mozart::VM vm, mozart::RichNode label, size_t width) { return _self.access().testTuple(_self, vm, label, width); } inline -bool TypedRichNode::testLabel(VM vm, class mozart::RichNode label) { +bool TypedRichNode::testLabel(mozart::VM vm, mozart::RichNode label) { return _self.access().testLabel(_self, vm, label); } inline -atom_t TypedRichNode::value() { +mozart::atom_t TypedRichNode::value() { return _self.access().value(); } inline -bool TypedRichNode::equals(VM vm, class mozart::RichNode right) { +bool TypedRichNode::equals(mozart::VM vm, mozart::RichNode right) { return _self.access().equals(vm, right); } inline -int TypedRichNode::compareFeatures(VM vm, class mozart::RichNode right) { +int TypedRichNode::compareFeatures(mozart::VM vm, mozart::RichNode right) { return _self.access().compareFeatures(vm, right); } inline -atom_t TypedRichNode::getPrintName(VM vm) { +mozart::atom_t TypedRichNode::getPrintName(mozart::VM vm) { return _self.access().getPrintName(vm); } inline -bool TypedRichNode::isAtom(VM vm) { +bool TypedRichNode::isAtom(mozart::VM vm) { return _self.access().isAtom(vm); } inline -int TypedRichNode::compare(VM vm, class mozart::RichNode right) { +int TypedRichNode::compare(mozart::VM vm, mozart::RichNode right) { return _self.access().compare(vm, right); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/AtomLike-interf.hh b/vm/boostenv/main/cached/AtomLike-interf.hh index 9dc552154..a5fbfd797 100644 --- a/vm/boostenv/main/cached/AtomLike-interf.hh +++ b/vm/boostenv/main/cached/AtomLike-interf.hh @@ -4,7 +4,7 @@ public: AtomLike(UnstableNode& self) : _self(self) {} AtomLike(StableNode& self) : _self(self) {} - bool isAtom(VM vm) { + bool isAtom(mozart::VM vm) { if (_self.is()) { return _self.as().isAtom(vm); } else if (_self.isTransient()) { diff --git a/vm/boostenv/main/cached/BaseDottable-interf.hh b/vm/boostenv/main/cached/BaseDottable-interf.hh index 1fa125a11..ae2ab6e88 100644 --- a/vm/boostenv/main/cached/BaseDottable-interf.hh +++ b/vm/boostenv/main/cached/BaseDottable-interf.hh @@ -4,7 +4,7 @@ public: BaseDottable(UnstableNode& self) : _self(self) {} BaseDottable(StableNode& self) : _self(self) {} - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { if (_self.is()) { return _self.as().lookupFeature(vm, feature, value); } else if (_self.is()) { @@ -42,7 +42,7 @@ public: } } - bool lookupFeature(VM vm, nativeint feature, nullable value) { + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { if (_self.is()) { return _self.as().lookupFeature(vm, feature, value); } else if (_self.is()) { diff --git a/vm/boostenv/main/cached/BigInt-implem-decl-after.hh b/vm/boostenv/main/cached/BigInt-implem-decl-after.hh index 88f966a71..c2be2e6da 100644 --- a/vm/boostenv/main/cached/BigInt-implem-decl-after.hh +++ b/vm/boostenv/main/cached/BigInt-implem-decl-after.hh @@ -48,46 +48,46 @@ public: std::shared_ptr value(); inline - bool equals(VM vm, class mozart::RichNode right); + bool equals(mozart::VM vm, mozart::RichNode right); inline - int compareFeatures(VM vm, class mozart::RichNode right); + int compareFeatures(mozart::VM vm, mozart::RichNode right); inline - int compare(VM vm, class mozart::RichNode right); + int compare(mozart::VM vm, mozart::RichNode right); inline - bool isNumber(VM vm); + bool isNumber(mozart::VM vm); inline - bool isInt(VM vm); + bool isInt(mozart::VM vm); inline - bool isFloat(VM vm); + bool isFloat(mozart::VM vm); inline - class mozart::UnstableNode opposite(VM vm); + mozart::UnstableNode opposite(mozart::VM vm); inline - class mozart::UnstableNode add(VM vm, class mozart::RichNode right); + mozart::UnstableNode add(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode add(VM vm, nativeint b); + mozart::UnstableNode add(mozart::VM vm, mozart::nativeint b); inline - class mozart::UnstableNode subtract(VM vm, class mozart::RichNode right); + mozart::UnstableNode subtract(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode multiply(VM vm, class mozart::RichNode right); + mozart::UnstableNode multiply(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode div(VM vm, class mozart::RichNode right); + mozart::UnstableNode div(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode mod(VM vm, class mozart::RichNode right); + mozart::UnstableNode mod(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode abs(VM vm); + mozart::UnstableNode abs(mozart::VM vm); inline double doubleValue(); @@ -96,5 +96,5 @@ public: std::string str(); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/BigInt-implem.hh b/vm/boostenv/main/cached/BigInt-implem.hh index 77be62db4..dd692c65a 100644 --- a/vm/boostenv/main/cached/BigInt-implem.hh +++ b/vm/boostenv/main/cached/BigInt-implem.hh @@ -36,72 +36,72 @@ std::shared_ptr TypedRichNode::value() { } inline -bool TypedRichNode::equals(VM vm, class mozart::RichNode right) { +bool TypedRichNode::equals(mozart::VM vm, mozart::RichNode right) { return _self.access().equals(vm, right); } inline -int TypedRichNode::compareFeatures(VM vm, class mozart::RichNode right) { +int TypedRichNode::compareFeatures(mozart::VM vm, mozart::RichNode right) { return _self.access().compareFeatures(vm, right); } inline -int TypedRichNode::compare(VM vm, class mozart::RichNode right) { +int TypedRichNode::compare(mozart::VM vm, mozart::RichNode right) { return _self.access().compare(vm, right); } inline -bool TypedRichNode::isNumber(VM vm) { +bool TypedRichNode::isNumber(mozart::VM vm) { return _self.access().isNumber(vm); } inline -bool TypedRichNode::isInt(VM vm) { +bool TypedRichNode::isInt(mozart::VM vm) { return _self.access().isInt(vm); } inline -bool TypedRichNode::isFloat(VM vm) { +bool TypedRichNode::isFloat(mozart::VM vm) { return _self.access().isFloat(vm); } inline -class mozart::UnstableNode TypedRichNode::opposite(VM vm) { +mozart::UnstableNode TypedRichNode::opposite(mozart::VM vm) { return _self.access().opposite(vm); } inline -class mozart::UnstableNode TypedRichNode::add(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::add(mozart::VM vm, mozart::RichNode right) { return _self.access().add(vm, right); } inline -class mozart::UnstableNode TypedRichNode::add(VM vm, nativeint b) { +mozart::UnstableNode TypedRichNode::add(mozart::VM vm, mozart::nativeint b) { return _self.access().add(vm, b); } inline -class mozart::UnstableNode TypedRichNode::subtract(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::subtract(mozart::VM vm, mozart::RichNode right) { return _self.access().subtract(vm, right); } inline -class mozart::UnstableNode TypedRichNode::multiply(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::multiply(mozart::VM vm, mozart::RichNode right) { return _self.access().multiply(vm, right); } inline -class mozart::UnstableNode TypedRichNode::div(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::div(mozart::VM vm, mozart::RichNode right) { return _self.access().div(vm, right); } inline -class mozart::UnstableNode TypedRichNode::mod(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::mod(mozart::VM vm, mozart::RichNode right) { return _self.access().mod(vm, right); } inline -class mozart::UnstableNode TypedRichNode::abs(VM vm) { +mozart::UnstableNode TypedRichNode::abs(mozart::VM vm) { return _self.access().abs(_self, vm); } @@ -116,6 +116,6 @@ std::string TypedRichNode::str() { } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/BindableReadOnly-interf.hh b/vm/boostenv/main/cached/BindableReadOnly-interf.hh index 7bfbff94b..c743f624f 100644 --- a/vm/boostenv/main/cached/BindableReadOnly-interf.hh +++ b/vm/boostenv/main/cached/BindableReadOnly-interf.hh @@ -4,7 +4,7 @@ public: BindableReadOnly(UnstableNode& self) : _self(self) {} BindableReadOnly(StableNode& self) : _self(self) {} - void bindReadOnly(VM vm, class mozart::RichNode src) { + void bindReadOnly(mozart::VM vm, mozart::RichNode src) { if (_self.is()) { return _self.as().bindReadOnly(vm, src); } else if (_self.is()) { diff --git a/vm/boostenv/main/cached/Boolean-implem-decl-after.hh b/vm/boostenv/main/cached/Boolean-implem-decl-after.hh index da2839d89..00ae58fd4 100644 --- a/vm/boostenv/main/cached/Boolean-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Boolean-implem-decl-after.hh @@ -48,62 +48,62 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - bool isLiteral(VM vm); + bool isLiteral(mozart::VM vm); inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline - bool isRecord(VM vm); + bool isRecord(mozart::VM vm); inline - bool isTuple(VM vm); + bool isTuple(mozart::VM vm); inline - class mozart::UnstableNode label(VM vm); + mozart::UnstableNode label(mozart::VM vm); inline - size_t width(VM vm); + size_t width(mozart::VM vm); inline - class mozart::UnstableNode arityList(VM vm); + mozart::UnstableNode arityList(mozart::VM vm); inline - class mozart::UnstableNode clone(VM vm); + mozart::UnstableNode clone(mozart::VM vm); inline - class mozart::UnstableNode waitOr(VM vm); + mozart::UnstableNode waitOr(mozart::VM vm); inline - bool testRecord(VM vm, class mozart::RichNode arity); + bool testRecord(mozart::VM vm, mozart::RichNode arity); inline - bool testTuple(VM vm, class mozart::RichNode label, size_t width); + bool testTuple(mozart::VM vm, mozart::RichNode label, size_t width); inline - bool testLabel(VM vm, class mozart::RichNode label); + bool testLabel(mozart::VM vm, mozart::RichNode label); inline bool value(); inline - bool equals(VM vm, class mozart::RichNode right); + bool equals(mozart::VM vm, mozart::RichNode right); inline - int compareFeatures(VM vm, class mozart::RichNode right); + int compareFeatures(mozart::VM vm, mozart::RichNode right); inline - atom_t getPrintName(VM vm); + mozart::atom_t getPrintName(mozart::VM vm); inline - bool isName(VM vm); + bool isName(mozart::VM vm); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/Boolean-implem.hh b/vm/boostenv/main/cached/Boolean-implem.hh index 049da9504..2bbba4002 100644 --- a/vm/boostenv/main/cached/Boolean-implem.hh +++ b/vm/boostenv/main/cached/Boolean-implem.hh @@ -36,67 +36,67 @@ int TypeInfoOf::compareFeatures(VM vm, RichNode lhs, RichNode rhs) cons inline -bool TypedRichNode::isLiteral(VM vm) { +bool TypedRichNode::isLiteral(mozart::VM vm) { return _self.access().isLiteral(vm); } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::isRecord(VM vm) { +bool TypedRichNode::isRecord(mozart::VM vm) { return _self.access().isRecord(vm); } inline -bool TypedRichNode::isTuple(VM vm) { +bool TypedRichNode::isTuple(mozart::VM vm) { return _self.access().isTuple(vm); } inline -class mozart::UnstableNode TypedRichNode::label(VM vm) { +mozart::UnstableNode TypedRichNode::label(mozart::VM vm) { return _self.access().label(_self, vm); } inline -size_t TypedRichNode::width(VM vm) { +size_t TypedRichNode::width(mozart::VM vm) { return _self.access().width(vm); } inline -class mozart::UnstableNode TypedRichNode::arityList(VM vm) { +mozart::UnstableNode TypedRichNode::arityList(mozart::VM vm) { return _self.access().arityList(vm); } inline -class mozart::UnstableNode TypedRichNode::clone(VM vm) { +mozart::UnstableNode TypedRichNode::clone(mozart::VM vm) { return _self.access().clone(_self, vm); } inline -class mozart::UnstableNode TypedRichNode::waitOr(VM vm) { +mozart::UnstableNode TypedRichNode::waitOr(mozart::VM vm) { return _self.access().waitOr(vm); } inline -bool TypedRichNode::testRecord(VM vm, class mozart::RichNode arity) { +bool TypedRichNode::testRecord(mozart::VM vm, mozart::RichNode arity) { return _self.access().testRecord(vm, arity); } inline -bool TypedRichNode::testTuple(VM vm, class mozart::RichNode label, size_t width) { +bool TypedRichNode::testTuple(mozart::VM vm, mozart::RichNode label, size_t width) { return _self.access().testTuple(_self, vm, label, width); } inline -bool TypedRichNode::testLabel(VM vm, class mozart::RichNode label) { +bool TypedRichNode::testLabel(mozart::VM vm, mozart::RichNode label) { return _self.access().testLabel(_self, vm, label); } @@ -106,31 +106,31 @@ bool TypedRichNode::value() { } inline -bool TypedRichNode::equals(VM vm, class mozart::RichNode right) { +bool TypedRichNode::equals(mozart::VM vm, mozart::RichNode right) { return _self.access().equals(vm, right); } inline -int TypedRichNode::compareFeatures(VM vm, class mozart::RichNode right) { +int TypedRichNode::compareFeatures(mozart::VM vm, mozart::RichNode right) { return _self.access().compareFeatures(vm, right); } inline -atom_t TypedRichNode::getPrintName(VM vm) { +mozart::atom_t TypedRichNode::getPrintName(mozart::VM vm) { return _self.access().getPrintName(vm); } inline -bool TypedRichNode::isName(VM vm) { +bool TypedRichNode::isName(mozart::VM vm) { return _self.access().isName(vm); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/BuiltinCallable-interf.hh b/vm/boostenv/main/cached/BuiltinCallable-interf.hh index 6de15bc8b..a74f5b166 100644 --- a/vm/boostenv/main/cached/BuiltinCallable-interf.hh +++ b/vm/boostenv/main/cached/BuiltinCallable-interf.hh @@ -4,7 +4,7 @@ public: BuiltinCallable(UnstableNode& self) : _self(self) {} BuiltinCallable(StableNode& self) : _self(self) {} - bool isBuiltin(VM vm) { + bool isBuiltin(mozart::VM vm) { if (_self.is()) { return _self.as().isBuiltin(vm); } else if (_self.isTransient()) { @@ -15,7 +15,7 @@ public: } } - void callBuiltin(VM vm, size_t argc, class mozart::UnstableNode ** args) { + void callBuiltin(mozart::VM vm, size_t argc, mozart::UnstableNode ** args) { if (_self.is()) { return _self.as().callBuiltin(vm, argc, args); } else if (_self.isTransient()) { @@ -27,7 +27,7 @@ public: } template - void callBuiltin(VM vm, Args &&... args) { + void callBuiltin(mozart::VM vm, Args &&... args) { if (_self.is()) { return _self.as().callBuiltin(vm, std::forward(args)...); } else if (_self.isTransient()) { @@ -38,7 +38,7 @@ public: } } - builtins::BaseBuiltin * getBuiltin(VM vm) { + builtins::BaseBuiltin * getBuiltin(mozart::VM vm) { if (_self.is()) { return _self.as().getBuiltin(vm); } else if (_self.isTransient()) { diff --git a/vm/boostenv/main/cached/BuiltinProcedure-implem-decl-after.hh b/vm/boostenv/main/cached/BuiltinProcedure-implem-decl-after.hh index b662bedfb..d34235333 100644 --- a/vm/boostenv/main/cached/BuiltinProcedure-implem-decl-after.hh +++ b/vm/boostenv/main/cached/BuiltinProcedure-implem-decl-after.hh @@ -51,42 +51,42 @@ public: size_t getArity(); inline - bool equals(VM vm, class mozart::RichNode right); + bool equals(mozart::VM vm, mozart::RichNode right); inline - atom_t getPrintName(VM vm); + mozart::atom_t getPrintName(mozart::VM vm); inline - bool isBuiltin(VM vm); + bool isBuiltin(mozart::VM vm); inline - void callBuiltin(VM vm, size_t argc, class mozart::UnstableNode ** args); + void callBuiltin(mozart::VM vm, size_t argc, mozart::UnstableNode ** args); template inline - void callBuiltin(VM vm, Args &&... args); + void callBuiltin(mozart::VM vm, Args &&... args); inline - builtins::BaseBuiltin * getBuiltin(VM vm); + builtins::BaseBuiltin * getBuiltin(mozart::VM vm); inline - bool isCallable(VM vm); + bool isCallable(mozart::VM vm); inline - bool isProcedure(VM vm); + bool isProcedure(mozart::VM vm); inline - size_t procedureArity(VM vm); + size_t procedureArity(mozart::VM vm); inline - void getCallInfo(VM vm, size_t & arity, ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks); + void getCallInfo(mozart::VM vm, size_t & arity, mozart::ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks); inline - void getDebugInfo(VM vm, atom_t & printName, class mozart::UnstableNode & debugData); + void getDebugInfo(mozart::VM vm, mozart::atom_t & printName, mozart::UnstableNode & debugData); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/BuiltinProcedure-implem.hh b/vm/boostenv/main/cached/BuiltinProcedure-implem.hh index 83160da7c..8dd2dbc83 100644 --- a/vm/boostenv/main/cached/BuiltinProcedure-implem.hh +++ b/vm/boostenv/main/cached/BuiltinProcedure-implem.hh @@ -41,67 +41,67 @@ size_t TypedRichNode::getArity() { } inline -bool TypedRichNode::equals(VM vm, class mozart::RichNode right) { +bool TypedRichNode::equals(mozart::VM vm, mozart::RichNode right) { return _self.access().equals(vm, right); } inline -atom_t TypedRichNode::getPrintName(VM vm) { +mozart::atom_t TypedRichNode::getPrintName(mozart::VM vm) { return _self.access().getPrintName(vm); } inline -bool TypedRichNode::isBuiltin(VM vm) { +bool TypedRichNode::isBuiltin(mozart::VM vm) { return _self.access().isBuiltin(vm); } inline -void TypedRichNode::callBuiltin(VM vm, size_t argc, class mozart::UnstableNode ** args) { +void TypedRichNode::callBuiltin(mozart::VM vm, size_t argc, mozart::UnstableNode ** args) { _self.access().callBuiltin(vm, argc, args); } template inline -void TypedRichNode::callBuiltin(VM vm, Args &&... args) { +void TypedRichNode::callBuiltin(mozart::VM vm, Args &&... args) { _self.access().callBuiltin(vm, std::forward(args)...); } inline -builtins::BaseBuiltin * TypedRichNode::getBuiltin(VM vm) { +builtins::BaseBuiltin * TypedRichNode::getBuiltin(mozart::VM vm) { return _self.access().getBuiltin(vm); } inline -bool TypedRichNode::isCallable(VM vm) { +bool TypedRichNode::isCallable(mozart::VM vm) { return _self.access().isCallable(vm); } inline -bool TypedRichNode::isProcedure(VM vm) { +bool TypedRichNode::isProcedure(mozart::VM vm) { return _self.access().isProcedure(vm); } inline -size_t TypedRichNode::procedureArity(VM vm) { +size_t TypedRichNode::procedureArity(mozart::VM vm) { return _self.access().procedureArity(vm); } inline -void TypedRichNode::getCallInfo(VM vm, size_t & arity, ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks) { +void TypedRichNode::getCallInfo(mozart::VM vm, size_t & arity, mozart::ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks) { _self.access().getCallInfo(_self, vm, arity, start, Xcount, Gs, Ks); } inline -void TypedRichNode::getDebugInfo(VM vm, atom_t & printName, class mozart::UnstableNode & debugData) { +void TypedRichNode::getDebugInfo(mozart::VM vm, mozart::atom_t & printName, mozart::UnstableNode & debugData) { _self.access().getDebugInfo(_self, vm, printName, debugData); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/ByteString-implem-decl-after.hh b/vm/boostenv/main/cached/ByteString-implem-decl-after.hh index b757fefb6..0ca48851e 100644 --- a/vm/boostenv/main/cached/ByteString-implem-decl-after.hh +++ b/vm/boostenv/main/cached/ByteString-implem-decl-after.hh @@ -42,50 +42,50 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline const LString & value(); inline - bool equals(VM vm, class mozart::RichNode right); + bool equals(mozart::VM vm, mozart::RichNode right); inline - int compare(VM vm, class mozart::RichNode right); + int compare(mozart::VM vm, mozart::RichNode right); inline - bool isString(VM vm); + bool isString(mozart::VM vm); inline - bool isByteString(VM vm); + bool isByteString(mozart::VM vm); inline - LString * stringGet(VM vm); + LString * stringGet(mozart::VM vm); inline - LString * byteStringGet(VM vm); + LString * byteStringGet(mozart::VM vm); inline - nativeint stringCharAt(VM vm, class mozart::RichNode offset); + mozart::nativeint stringCharAt(mozart::VM vm, mozart::RichNode offset); inline - class mozart::UnstableNode stringAppend(VM vm, class mozart::RichNode right); + mozart::UnstableNode stringAppend(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode stringSlice(VM vm, class mozart::RichNode from, class mozart::RichNode to); + mozart::UnstableNode stringSlice(mozart::VM vm, mozart::RichNode from, mozart::RichNode to); inline - void stringSearch(VM vm, class mozart::RichNode from, class mozart::RichNode needle, class mozart::UnstableNode & begin, class mozart::UnstableNode & end); + void stringSearch(mozart::VM vm, mozart::RichNode from, mozart::RichNode needle, mozart::UnstableNode & begin, mozart::UnstableNode & end); inline - bool stringHasPrefix(VM vm, class mozart::RichNode prefix); + bool stringHasPrefix(mozart::VM vm, mozart::RichNode prefix); inline - bool stringHasSuffix(VM vm, class mozart::RichNode suffix); + bool stringHasSuffix(mozart::VM vm, mozart::RichNode suffix); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/ByteString-implem.hh b/vm/boostenv/main/cached/ByteString-implem.hh index 167ec8b38..eab291308 100644 --- a/vm/boostenv/main/cached/ByteString-implem.hh +++ b/vm/boostenv/main/cached/ByteString-implem.hh @@ -26,12 +26,12 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) cons } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } @@ -41,66 +41,66 @@ const LString & TypedRichNode::value() { } inline -bool TypedRichNode::equals(VM vm, class mozart::RichNode right) { +bool TypedRichNode::equals(mozart::VM vm, mozart::RichNode right) { return _self.access().equals(vm, right); } inline -int TypedRichNode::compare(VM vm, class mozart::RichNode right) { +int TypedRichNode::compare(mozart::VM vm, mozart::RichNode right) { return _self.access().compare(vm, right); } inline -bool TypedRichNode::isString(VM vm) { +bool TypedRichNode::isString(mozart::VM vm) { return _self.access().isString(vm); } inline -bool TypedRichNode::isByteString(VM vm) { +bool TypedRichNode::isByteString(mozart::VM vm) { return _self.access().isByteString(vm); } inline -LString * TypedRichNode::stringGet(VM vm) { +LString * TypedRichNode::stringGet(mozart::VM vm) { return _self.access().stringGet(_self, vm); } inline -LString * TypedRichNode::byteStringGet(VM vm) { +LString * TypedRichNode::byteStringGet(mozart::VM vm) { return _self.access().byteStringGet(vm); } inline -nativeint TypedRichNode::stringCharAt(VM vm, class mozart::RichNode offset) { +mozart::nativeint TypedRichNode::stringCharAt(mozart::VM vm, mozart::RichNode offset) { return _self.access().stringCharAt(_self, vm, offset); } inline -class mozart::UnstableNode TypedRichNode::stringAppend(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::stringAppend(mozart::VM vm, mozart::RichNode right) { return _self.access().stringAppend(_self, vm, right); } inline -class mozart::UnstableNode TypedRichNode::stringSlice(VM vm, class mozart::RichNode from, class mozart::RichNode to) { +mozart::UnstableNode TypedRichNode::stringSlice(mozart::VM vm, mozart::RichNode from, mozart::RichNode to) { return _self.access().stringSlice(_self, vm, from, to); } inline -void TypedRichNode::stringSearch(VM vm, class mozart::RichNode from, class mozart::RichNode needle, class mozart::UnstableNode & begin, class mozart::UnstableNode & end) { +void TypedRichNode::stringSearch(mozart::VM vm, mozart::RichNode from, mozart::RichNode needle, mozart::UnstableNode & begin, mozart::UnstableNode & end) { _self.access().stringSearch(_self, vm, from, needle, begin, end); } inline -bool TypedRichNode::stringHasPrefix(VM vm, class mozart::RichNode prefix) { +bool TypedRichNode::stringHasPrefix(mozart::VM vm, mozart::RichNode prefix) { return _self.access().stringHasPrefix(vm, prefix); } inline -bool TypedRichNode::stringHasSuffix(VM vm, class mozart::RichNode suffix) { +bool TypedRichNode::stringHasSuffix(mozart::VM vm, mozart::RichNode suffix) { return _self.access().stringHasSuffix(vm, suffix); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/Callable-interf.hh b/vm/boostenv/main/cached/Callable-interf.hh index accdfc6fd..77cc77ce1 100644 --- a/vm/boostenv/main/cached/Callable-interf.hh +++ b/vm/boostenv/main/cached/Callable-interf.hh @@ -4,7 +4,7 @@ public: Callable(UnstableNode& self) : _self(self) {} Callable(StableNode& self) : _self(self) {} - bool isCallable(VM vm) { + bool isCallable(mozart::VM vm) { if (_self.is()) { return _self.as().isCallable(vm); } else if (_self.is()) { @@ -19,7 +19,7 @@ public: } } - bool isProcedure(VM vm) { + bool isProcedure(mozart::VM vm) { if (_self.is()) { return _self.as().isProcedure(vm); } else if (_self.is()) { @@ -34,7 +34,7 @@ public: } } - size_t procedureArity(VM vm) { + size_t procedureArity(mozart::VM vm) { if (_self.is()) { return _self.as().procedureArity(vm); } else if (_self.is()) { @@ -49,7 +49,7 @@ public: } } - void getCallInfo(VM vm, size_t & arity, ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks) { + void getCallInfo(mozart::VM vm, size_t & arity, mozart::ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks) { if (_self.is()) { return _self.as().getCallInfo(vm, arity, start, Xcount, Gs, Ks); } else if (_self.is()) { @@ -64,7 +64,7 @@ public: } } - void getDebugInfo(VM vm, atom_t & printName, class mozart::UnstableNode & debugData) { + void getDebugInfo(mozart::VM vm, mozart::atom_t & printName, mozart::UnstableNode & debugData) { if (_self.is()) { return _self.as().getDebugInfo(vm, printName, debugData); } else if (_self.is()) { diff --git a/vm/boostenv/main/cached/Cell-implem-decl-after.hh b/vm/boostenv/main/cached/Cell-implem-decl-after.hh index b808ef55c..680f9c4c5 100644 --- a/vm/boostenv/main/cached/Cell-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Cell-implem-decl-after.hh @@ -42,20 +42,20 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::Space * home(); + mozart::Space * home(); inline - bool isCell(VM vm); + bool isCell(mozart::VM vm); inline - class mozart::UnstableNode exchange(VM vm, class mozart::RichNode newValue); + mozart::UnstableNode exchange(mozart::VM vm, mozart::RichNode newValue); inline - class mozart::UnstableNode access(VM vm); + mozart::UnstableNode access(mozart::VM vm); inline - void assign(VM vm, class mozart::RichNode newValue); + void assign(mozart::VM vm, mozart::RichNode newValue); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/Cell-implem.hh b/vm/boostenv/main/cached/Cell-implem.hh index 0ad5098ec..bb0291c91 100644 --- a/vm/boostenv/main/cached/Cell-implem.hh +++ b/vm/boostenv/main/cached/Cell-implem.hh @@ -34,31 +34,31 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) const { } inline -class mozart::Space * TypedRichNode::home() { +mozart::Space * TypedRichNode::home() { return _self.access().home(); } inline -bool TypedRichNode::isCell(VM vm) { +bool TypedRichNode::isCell(mozart::VM vm) { return _self.access().isCell(vm); } inline -class mozart::UnstableNode TypedRichNode::exchange(VM vm, class mozart::RichNode newValue) { +mozart::UnstableNode TypedRichNode::exchange(mozart::VM vm, mozart::RichNode newValue) { return _self.access().exchange(vm, newValue); } inline -class mozart::UnstableNode TypedRichNode::access(VM vm) { +mozart::UnstableNode TypedRichNode::access(mozart::VM vm) { return _self.access().access(vm); } inline -void TypedRichNode::assign(VM vm, class mozart::RichNode newValue) { +void TypedRichNode::assign(mozart::VM vm, mozart::RichNode newValue) { _self.access().assign(vm, newValue); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/CellLike-interf.hh b/vm/boostenv/main/cached/CellLike-interf.hh index f4d12ee8d..9f25c74e7 100644 --- a/vm/boostenv/main/cached/CellLike-interf.hh +++ b/vm/boostenv/main/cached/CellLike-interf.hh @@ -4,7 +4,7 @@ public: CellLike(UnstableNode& self) : _self(self) {} CellLike(StableNode& self) : _self(self) {} - bool isCell(VM vm) { + bool isCell(mozart::VM vm) { if (_self.is()) { return _self.as().isCell(vm); } else if (_self.isTransient()) { @@ -20,7 +20,7 @@ public: } } - class mozart::UnstableNode exchange(VM vm, class mozart::RichNode newValue) { + mozart::UnstableNode exchange(mozart::VM vm, mozart::RichNode newValue) { if (_self.is()) { return _self.as().exchange(vm, newValue); } else if (_self.isTransient()) { @@ -28,7 +28,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::CellLike::exchange", "exchange", newValue, ::mozart::ozcalls::out(_result))) return _result; } @@ -36,7 +36,7 @@ public: } } - class mozart::UnstableNode access(VM vm) { + mozart::UnstableNode access(mozart::VM vm) { if (_self.is()) { return _self.as().access(vm); } else if (_self.isTransient()) { @@ -44,7 +44,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::CellLike::access", "access", ::mozart::ozcalls::out(_result))) return _result; } @@ -52,7 +52,7 @@ public: } } - void assign(VM vm, class mozart::RichNode newValue) { + void assign(mozart::VM vm, mozart::RichNode newValue) { if (_self.is()) { return _self.as().assign(vm, newValue); } else if (_self.isTransient()) { diff --git a/vm/boostenv/main/cached/Chunk-implem-decl-after.hh b/vm/boostenv/main/cached/Chunk-implem-decl-after.hh index c77427ea4..31b86a485 100644 --- a/vm/boostenv/main/cached/Chunk-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Chunk-implem-decl-after.hh @@ -45,20 +45,20 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::StableNode * getUnderlying(); + mozart::StableNode * getUnderlying(); inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline - bool isChunk(VM vm); + bool isChunk(mozart::VM vm); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); }; diff --git a/vm/boostenv/main/cached/Chunk-implem-decl.hh b/vm/boostenv/main/cached/Chunk-implem-decl.hh index 13f291889..dfbf50345 100644 --- a/vm/boostenv/main/cached/Chunk-implem-decl.hh +++ b/vm/boostenv/main/cached/Chunk-implem-decl.hh @@ -3,5 +3,5 @@ class Chunk; template <> class Storage { public: - typedef class mozart::StableNode * Type; + typedef mozart::StableNode * Type; }; diff --git a/vm/boostenv/main/cached/Chunk-implem.hh b/vm/boostenv/main/cached/Chunk-implem.hh index 7e58f9250..2b38e0e46 100644 --- a/vm/boostenv/main/cached/Chunk-implem.hh +++ b/vm/boostenv/main/cached/Chunk-implem.hh @@ -17,9 +17,7 @@ void TypeInfoOf::gCollect(GC gc, RichNode from, StableNode& to) const { void TypeInfoOf::gCollect(GC gc, RichNode from, UnstableNode& to) const { assert(from.type() == type()); - StableNode* stable = new (gc->vm) StableNode; - to.make(gc->vm, stable); - stable->make(gc->vm, gc, from.access()); + to.make(gc->vm, gc, from.access()); } void TypeInfoOf::sClone(SC sc, RichNode from, StableNode& to) const { @@ -33,31 +31,31 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) const { } inline -class mozart::StableNode * TypedRichNode::getUnderlying() { +mozart::StableNode * TypedRichNode::getUnderlying() { return _self.access().getUnderlying(); } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::isChunk(VM vm) { +bool TypedRichNode::isChunk(mozart::VM vm) { return _self.access().isChunk(vm); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } diff --git a/vm/boostenv/main/cached/ChunkLike-interf.hh b/vm/boostenv/main/cached/ChunkLike-interf.hh index 4a35b6b74..daeae8abe 100644 --- a/vm/boostenv/main/cached/ChunkLike-interf.hh +++ b/vm/boostenv/main/cached/ChunkLike-interf.hh @@ -4,7 +4,7 @@ public: ChunkLike(UnstableNode& self) : _self(self) {} ChunkLike(StableNode& self) : _self(self) {} - bool isChunk(VM vm) { + bool isChunk(mozart::VM vm) { if (_self.is()) { return _self.as().isChunk(vm); } else if (_self.is()) { diff --git a/vm/boostenv/main/cached/CodeArea-implem-decl-after.hh b/vm/boostenv/main/cached/CodeArea-implem-decl-after.hh index 21003cb6c..aa9c96cf6 100644 --- a/vm/boostenv/main/cached/CodeArea-implem-decl-after.hh +++ b/vm/boostenv/main/cached/CodeArea-implem-decl-after.hh @@ -51,32 +51,32 @@ public: size_t getArraySize(); inline - StaticArray getElementsArray(); + StaticArray getElementsArray(); inline - class mozart::StableNode& getElements(size_t i); + mozart::StableNode& getElements(size_t i); inline size_t getArraySizeImpl(); inline - bool isCodeAreaProvider(VM vm); + bool isCodeAreaProvider(mozart::VM vm); inline - void getCodeAreaInfo(VM vm, size_t & arity, ProgramCounter & start, size_t & Xcount, StaticArray & Ks); + void getCodeAreaInfo(mozart::VM vm, size_t & arity, mozart::ProgramCounter & start, size_t & Xcount, StaticArray & Ks); inline - void getCodeAreaDebugInfo(VM vm, atom_t & printName, class mozart::UnstableNode & debugData); + void getCodeAreaDebugInfo(mozart::VM vm, mozart::atom_t & printName, mozart::UnstableNode & debugData); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); inline - class mozart::GlobalNode * globalize(VM vm); + mozart::GlobalNode * globalize(mozart::VM vm); inline - void setUUID(VM vm, const struct mozart::UUID & uuid); + void setUUID(mozart::VM vm, const mozart::UUID & uuid); }; diff --git a/vm/boostenv/main/cached/CodeArea-implem-decl.hh b/vm/boostenv/main/cached/CodeArea-implem-decl.hh index a2ec4250d..22815fbed 100644 --- a/vm/boostenv/main/cached/CodeArea-implem-decl.hh +++ b/vm/boostenv/main/cached/CodeArea-implem-decl.hh @@ -3,5 +3,5 @@ class CodeArea; template <> class Storage { public: - typedef ImplWithArray Type; + typedef ImplWithArray Type; }; diff --git a/vm/boostenv/main/cached/CodeArea-implem.hh b/vm/boostenv/main/cached/CodeArea-implem.hh index bbe5d81ed..090c1d8a7 100644 --- a/vm/boostenv/main/cached/CodeArea-implem.hh +++ b/vm/boostenv/main/cached/CodeArea-implem.hh @@ -39,11 +39,11 @@ size_t TypedRichNode::getArraySize() { return _self.access().getArraySize(); } -StaticArray TypedRichNode::getElementsArray() { +StaticArray TypedRichNode::getElementsArray() { return _self.access().getElementsArray(); } -class mozart::StableNode& TypedRichNode::getElements(size_t i) { +mozart::StableNode& TypedRichNode::getElements(size_t i) { return _self.access().getElements(i); } @@ -53,36 +53,36 @@ size_t TypedRichNode::getArraySizeImpl() { } inline -bool TypedRichNode::isCodeAreaProvider(VM vm) { +bool TypedRichNode::isCodeAreaProvider(mozart::VM vm) { return _self.access().isCodeAreaProvider(vm); } inline -void TypedRichNode::getCodeAreaInfo(VM vm, size_t & arity, ProgramCounter & start, size_t & Xcount, StaticArray & Ks) { +void TypedRichNode::getCodeAreaInfo(mozart::VM vm, size_t & arity, mozart::ProgramCounter & start, size_t & Xcount, StaticArray & Ks) { _self.access().getCodeAreaInfo(vm, arity, start, Xcount, Ks); } inline -void TypedRichNode::getCodeAreaDebugInfo(VM vm, atom_t & printName, class mozart::UnstableNode & debugData) { +void TypedRichNode::getCodeAreaDebugInfo(mozart::VM vm, mozart::atom_t & printName, mozart::UnstableNode & debugData) { _self.access().getCodeAreaDebugInfo(vm, printName, debugData); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } inline -class mozart::GlobalNode * TypedRichNode::globalize(VM vm) { +mozart::GlobalNode * TypedRichNode::globalize(mozart::VM vm) { return _self.access().globalize(_self, vm); } inline -void TypedRichNode::setUUID(VM vm, const struct mozart::UUID & uuid) { +void TypedRichNode::setUUID(mozart::VM vm, const mozart::UUID & uuid) { _self.access().setUUID(_self, vm, uuid); } diff --git a/vm/boostenv/main/cached/CodeAreaProvider-interf.hh b/vm/boostenv/main/cached/CodeAreaProvider-interf.hh index b37b30ffc..80eef0fbd 100644 --- a/vm/boostenv/main/cached/CodeAreaProvider-interf.hh +++ b/vm/boostenv/main/cached/CodeAreaProvider-interf.hh @@ -4,7 +4,7 @@ public: CodeAreaProvider(UnstableNode& self) : _self(self) {} CodeAreaProvider(StableNode& self) : _self(self) {} - bool isCodeAreaProvider(VM vm) { + bool isCodeAreaProvider(mozart::VM vm) { if (_self.is()) { return _self.as().isCodeAreaProvider(vm); } else if (_self.isTransient()) { @@ -15,7 +15,7 @@ public: } } - void getCodeAreaInfo(VM vm, size_t & arity, ProgramCounter & start, size_t & Xcount, StaticArray & Ks) { + void getCodeAreaInfo(mozart::VM vm, size_t & arity, mozart::ProgramCounter & start, size_t & Xcount, StaticArray & Ks) { if (_self.is()) { return _self.as().getCodeAreaInfo(vm, arity, start, Xcount, Ks); } else if (_self.isTransient()) { @@ -26,7 +26,7 @@ public: } } - void getCodeAreaDebugInfo(VM vm, atom_t & printName, class mozart::UnstableNode & debugData) { + void getCodeAreaDebugInfo(mozart::VM vm, mozart::atom_t & printName, mozart::UnstableNode & debugData) { if (_self.is()) { return _self.as().getCodeAreaDebugInfo(vm, printName, debugData); } else if (_self.isTransient()) { diff --git a/vm/boostenv/main/cached/Comparable-interf.hh b/vm/boostenv/main/cached/Comparable-interf.hh index ce9900b92..e879840e6 100644 --- a/vm/boostenv/main/cached/Comparable-interf.hh +++ b/vm/boostenv/main/cached/Comparable-interf.hh @@ -4,7 +4,7 @@ public: Comparable(UnstableNode& self) : _self(self) {} Comparable(StableNode& self) : _self(self) {} - int compare(VM vm, class mozart::RichNode right) { + int compare(mozart::VM vm, mozart::RichNode right) { if (_self.is()) { return _self.as().compare(vm, right); } else if (_self.is()) { diff --git a/vm/boostenv/main/cached/Cons-implem-decl-after.hh b/vm/boostenv/main/cached/Cons-implem-decl-after.hh index a0509c35d..d808eda65 100644 --- a/vm/boostenv/main/cached/Cons-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Cons-implem-decl-after.hh @@ -45,59 +45,59 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline - class mozart::StableNode * getHead(); + mozart::StableNode * getHead(); inline - class mozart::StableNode * getTail(); + mozart::StableNode * getTail(); inline - StaticArray getElementsArray(); + StaticArray getElementsArray(); inline - bool equals(VM vm, class mozart::RichNode right, class mozart::WalkStack & stack); + bool equals(mozart::VM vm, mozart::RichNode right, mozart::WalkStack & stack); inline - bool isRecord(VM vm); + bool isRecord(mozart::VM vm); inline - bool isTuple(VM vm); + bool isTuple(mozart::VM vm); inline - class mozart::UnstableNode label(VM vm); + mozart::UnstableNode label(mozart::VM vm); inline - size_t width(VM vm); + size_t width(mozart::VM vm); inline - class mozart::UnstableNode arityList(VM vm); + mozart::UnstableNode arityList(mozart::VM vm); inline - class mozart::UnstableNode clone(VM vm); + mozart::UnstableNode clone(mozart::VM vm); inline - class mozart::UnstableNode waitOr(VM vm); + mozart::UnstableNode waitOr(mozart::VM vm); inline - bool testRecord(VM vm, class mozart::RichNode arity); + bool testRecord(mozart::VM vm, mozart::RichNode arity); inline - bool testTuple(VM vm, class mozart::RichNode label, size_t width); + bool testTuple(mozart::VM vm, mozart::RichNode label, size_t width); inline - bool testLabel(VM vm, class mozart::RichNode label); + bool testLabel(mozart::VM vm, mozart::RichNode label); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); inline - bool hasListRepr(VM vm, int depth); + bool hasListRepr(mozart::VM vm, int depth); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); }; diff --git a/vm/boostenv/main/cached/Cons-implem.hh b/vm/boostenv/main/cached/Cons-implem.hh index 6eaf7bf15..e331edd33 100644 --- a/vm/boostenv/main/cached/Cons-implem.hh +++ b/vm/boostenv/main/cached/Cons-implem.hh @@ -31,96 +31,96 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) const { } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -class mozart::StableNode * TypedRichNode::getHead() { +mozart::StableNode * TypedRichNode::getHead() { return _self.access().getHead(); } inline -class mozart::StableNode * TypedRichNode::getTail() { +mozart::StableNode * TypedRichNode::getTail() { return _self.access().getTail(); } inline -StaticArray TypedRichNode::getElementsArray() { +StaticArray TypedRichNode::getElementsArray() { return _self.access().getElementsArray(); } inline -bool TypedRichNode::equals(VM vm, class mozart::RichNode right, class mozart::WalkStack & stack) { +bool TypedRichNode::equals(mozart::VM vm, mozart::RichNode right, mozart::WalkStack & stack) { return _self.access().equals(vm, right, stack); } inline -bool TypedRichNode::isRecord(VM vm) { +bool TypedRichNode::isRecord(mozart::VM vm) { return _self.access().isRecord(vm); } inline -bool TypedRichNode::isTuple(VM vm) { +bool TypedRichNode::isTuple(mozart::VM vm) { return _self.access().isTuple(vm); } inline -class mozart::UnstableNode TypedRichNode::label(VM vm) { +mozart::UnstableNode TypedRichNode::label(mozart::VM vm) { return _self.access().label(vm); } inline -size_t TypedRichNode::width(VM vm) { +size_t TypedRichNode::width(mozart::VM vm) { return _self.access().width(vm); } inline -class mozart::UnstableNode TypedRichNode::arityList(VM vm) { +mozart::UnstableNode TypedRichNode::arityList(mozart::VM vm) { return _self.access().arityList(vm); } inline -class mozart::UnstableNode TypedRichNode::clone(VM vm) { +mozart::UnstableNode TypedRichNode::clone(mozart::VM vm) { return _self.access().clone(vm); } inline -class mozart::UnstableNode TypedRichNode::waitOr(VM vm) { +mozart::UnstableNode TypedRichNode::waitOr(mozart::VM vm) { return _self.access().waitOr(vm); } inline -bool TypedRichNode::testRecord(VM vm, class mozart::RichNode arity) { +bool TypedRichNode::testRecord(mozart::VM vm, mozart::RichNode arity) { return _self.access().testRecord(vm, arity); } inline -bool TypedRichNode::testTuple(VM vm, class mozart::RichNode label, size_t width) { +bool TypedRichNode::testTuple(mozart::VM vm, mozart::RichNode label, size_t width) { return _self.access().testTuple(vm, label, width); } inline -bool TypedRichNode::testLabel(VM vm, class mozart::RichNode label) { +bool TypedRichNode::testLabel(mozart::VM vm, mozart::RichNode label) { return _self.access().testLabel(vm, label); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } inline -bool TypedRichNode::hasListRepr(VM vm, int depth) { +bool TypedRichNode::hasListRepr(mozart::VM vm, int depth) { return _self.access().hasListRepr(vm, depth); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } diff --git a/vm/boostenv/main/cached/DataflowVariable-interf.hh b/vm/boostenv/main/cached/DataflowVariable-interf.hh index 2f57cd7d1..1cf5935e1 100644 --- a/vm/boostenv/main/cached/DataflowVariable-interf.hh +++ b/vm/boostenv/main/cached/DataflowVariable-interf.hh @@ -4,7 +4,7 @@ public: DataflowVariable(UnstableNode& self) : _self(self) {} DataflowVariable(StableNode& self) : _self(self) {} - void addToSuspendList(VM vm, class mozart::RichNode variable) { + void addToSuspendList(mozart::VM vm, mozart::RichNode variable) { if (_self.is()) { return _self.as().addToSuspendList(vm, variable); } else if (_self.is()) { @@ -22,7 +22,7 @@ public: } } - bool isNeeded(VM vm) { + bool isNeeded(mozart::VM vm) { if (_self.is()) { return _self.as().isNeeded(vm); } else if (_self.is()) { @@ -40,7 +40,7 @@ public: } } - void markNeeded(VM vm) { + void markNeeded(mozart::VM vm) { if (_self.is()) { return _self.as().markNeeded(vm); } else if (_self.is()) { @@ -58,7 +58,7 @@ public: } } - void bind(VM vm, class mozart::RichNode src) { + void bind(mozart::VM vm, mozart::RichNode src) { if (_self.is()) { return _self.as().bind(vm, src); } else if (_self.is()) { diff --git a/vm/boostenv/main/cached/Dictionary-implem-decl-after.hh b/vm/boostenv/main/cached/Dictionary-implem-decl-after.hh index 7755836e0..9a7a60e0f 100644 --- a/vm/boostenv/main/cached/Dictionary-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Dictionary-implem-decl-after.hh @@ -42,65 +42,65 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::Space * home(); + mozart::Space * home(); inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline - void dotAssign(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue); + void dotAssign(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue); inline - class mozart::UnstableNode dotExchange(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue); + mozart::UnstableNode dotExchange(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue); inline - bool isDictionary(VM vm); + bool isDictionary(mozart::VM vm); inline - bool dictIsEmpty(VM vm); + bool dictIsEmpty(mozart::VM vm); inline - bool dictMember(VM vm, class mozart::RichNode feature); + bool dictMember(mozart::VM vm, mozart::RichNode feature); inline - class mozart::UnstableNode dictGet(VM vm, class mozart::RichNode feature); + mozart::UnstableNode dictGet(mozart::VM vm, mozart::RichNode feature); inline - class mozart::UnstableNode dictCondGet(VM vm, class mozart::RichNode feature, class mozart::RichNode defaultValue); + mozart::UnstableNode dictCondGet(mozart::VM vm, mozart::RichNode feature, mozart::RichNode defaultValue); inline - void dictPut(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue); + void dictPut(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue); inline - class mozart::UnstableNode dictExchange(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue); + mozart::UnstableNode dictExchange(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue); inline - class mozart::UnstableNode dictCondExchange(VM vm, class mozart::RichNode feature, class mozart::RichNode defaultValue, class mozart::RichNode newValue); + mozart::UnstableNode dictCondExchange(mozart::VM vm, mozart::RichNode feature, mozart::RichNode defaultValue, mozart::RichNode newValue); inline - void dictRemove(VM vm, class mozart::RichNode feature); + void dictRemove(mozart::VM vm, mozart::RichNode feature); inline - void dictRemoveAll(VM vm); + void dictRemoveAll(mozart::VM vm); inline - class mozart::UnstableNode dictKeys(VM vm); + mozart::UnstableNode dictKeys(mozart::VM vm); inline - class mozart::UnstableNode dictEntries(VM vm); + mozart::UnstableNode dictEntries(mozart::VM vm); inline - class mozart::UnstableNode dictItems(VM vm); + mozart::UnstableNode dictItems(mozart::VM vm); inline - class mozart::UnstableNode dictClone(VM vm); + mozart::UnstableNode dictClone(mozart::VM vm); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); inline - class mozart::NodeDictionary & getDict(); + mozart::NodeDictionary & getDict(); }; diff --git a/vm/boostenv/main/cached/Dictionary-implem.hh b/vm/boostenv/main/cached/Dictionary-implem.hh index 05d4513b9..5641b7c8f 100644 --- a/vm/boostenv/main/cached/Dictionary-implem.hh +++ b/vm/boostenv/main/cached/Dictionary-implem.hh @@ -34,106 +34,106 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) cons } inline -class mozart::Space * TypedRichNode::home() { +mozart::Space * TypedRichNode::home() { return _self.access().home(); } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -void TypedRichNode::dotAssign(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue) { +void TypedRichNode::dotAssign(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue) { _self.access().dotAssign(vm, feature, newValue); } inline -class mozart::UnstableNode TypedRichNode::dotExchange(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue) { +mozart::UnstableNode TypedRichNode::dotExchange(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue) { return _self.access().dotExchange(_self, vm, feature, newValue); } inline -bool TypedRichNode::isDictionary(VM vm) { +bool TypedRichNode::isDictionary(mozart::VM vm) { return _self.access().isDictionary(vm); } inline -bool TypedRichNode::dictIsEmpty(VM vm) { +bool TypedRichNode::dictIsEmpty(mozart::VM vm) { return _self.access().dictIsEmpty(vm); } inline -bool TypedRichNode::dictMember(VM vm, class mozart::RichNode feature) { +bool TypedRichNode::dictMember(mozart::VM vm, mozart::RichNode feature) { return _self.access().dictMember(vm, feature); } inline -class mozart::UnstableNode TypedRichNode::dictGet(VM vm, class mozart::RichNode feature) { +mozart::UnstableNode TypedRichNode::dictGet(mozart::VM vm, mozart::RichNode feature) { return _self.access().dictGet(_self, vm, feature); } inline -class mozart::UnstableNode TypedRichNode::dictCondGet(VM vm, class mozart::RichNode feature, class mozart::RichNode defaultValue) { +mozart::UnstableNode TypedRichNode::dictCondGet(mozart::VM vm, mozart::RichNode feature, mozart::RichNode defaultValue) { return _self.access().dictCondGet(vm, feature, defaultValue); } inline -void TypedRichNode::dictPut(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue) { +void TypedRichNode::dictPut(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue) { _self.access().dictPut(vm, feature, newValue); } inline -class mozart::UnstableNode TypedRichNode::dictExchange(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue) { +mozart::UnstableNode TypedRichNode::dictExchange(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue) { return _self.access().dictExchange(_self, vm, feature, newValue); } inline -class mozart::UnstableNode TypedRichNode::dictCondExchange(VM vm, class mozart::RichNode feature, class mozart::RichNode defaultValue, class mozart::RichNode newValue) { +mozart::UnstableNode TypedRichNode::dictCondExchange(mozart::VM vm, mozart::RichNode feature, mozart::RichNode defaultValue, mozart::RichNode newValue) { return _self.access().dictCondExchange(vm, feature, defaultValue, newValue); } inline -void TypedRichNode::dictRemove(VM vm, class mozart::RichNode feature) { +void TypedRichNode::dictRemove(mozart::VM vm, mozart::RichNode feature) { _self.access().dictRemove(vm, feature); } inline -void TypedRichNode::dictRemoveAll(VM vm) { +void TypedRichNode::dictRemoveAll(mozart::VM vm) { _self.access().dictRemoveAll(vm); } inline -class mozart::UnstableNode TypedRichNode::dictKeys(VM vm) { +mozart::UnstableNode TypedRichNode::dictKeys(mozart::VM vm) { return _self.access().dictKeys(vm); } inline -class mozart::UnstableNode TypedRichNode::dictEntries(VM vm) { +mozart::UnstableNode TypedRichNode::dictEntries(mozart::VM vm) { return _self.access().dictEntries(vm); } inline -class mozart::UnstableNode TypedRichNode::dictItems(VM vm) { +mozart::UnstableNode TypedRichNode::dictItems(mozart::VM vm) { return _self.access().dictItems(vm); } inline -class mozart::UnstableNode TypedRichNode::dictClone(VM vm) { +mozart::UnstableNode TypedRichNode::dictClone(mozart::VM vm) { return _self.access().dictClone(vm); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } inline -class mozart::NodeDictionary & TypedRichNode::getDict() { +mozart::NodeDictionary & TypedRichNode::getDict() { return _self.access().getDict(); } diff --git a/vm/boostenv/main/cached/DictionaryLike-interf.hh b/vm/boostenv/main/cached/DictionaryLike-interf.hh index 06fc94d0f..f5538659b 100644 --- a/vm/boostenv/main/cached/DictionaryLike-interf.hh +++ b/vm/boostenv/main/cached/DictionaryLike-interf.hh @@ -4,7 +4,7 @@ public: DictionaryLike(UnstableNode& self) : _self(self) {} DictionaryLike(StableNode& self) : _self(self) {} - bool isDictionary(VM vm) { + bool isDictionary(mozart::VM vm) { if (_self.is()) { return _self.as().isDictionary(vm); } else if (_self.isTransient()) { @@ -20,7 +20,7 @@ public: } } - bool dictIsEmpty(VM vm) { + bool dictIsEmpty(mozart::VM vm) { if (_self.is()) { return _self.as().dictIsEmpty(vm); } else if (_self.isTransient()) { @@ -36,7 +36,7 @@ public: } } - bool dictMember(VM vm, class mozart::RichNode feature) { + bool dictMember(mozart::VM vm, mozart::RichNode feature) { if (_self.is()) { return _self.as().dictMember(vm, feature); } else if (_self.isTransient()) { @@ -52,7 +52,7 @@ public: } } - class mozart::UnstableNode dictGet(VM vm, class mozart::RichNode feature) { + mozart::UnstableNode dictGet(mozart::VM vm, mozart::RichNode feature) { if (_self.is()) { return _self.as().dictGet(vm, feature); } else if (_self.isTransient()) { @@ -60,7 +60,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::DictionaryLike::dictGet", "dictGet", feature, ::mozart::ozcalls::out(_result))) return _result; } @@ -68,7 +68,7 @@ public: } } - class mozart::UnstableNode dictCondGet(VM vm, class mozart::RichNode feature, class mozart::RichNode defaultValue) { + mozart::UnstableNode dictCondGet(mozart::VM vm, mozart::RichNode feature, mozart::RichNode defaultValue) { if (_self.is()) { return _self.as().dictCondGet(vm, feature, defaultValue); } else if (_self.isTransient()) { @@ -76,7 +76,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::DictionaryLike::dictCondGet", "dictCondGet", feature, defaultValue, ::mozart::ozcalls::out(_result))) return _result; } @@ -84,7 +84,7 @@ public: } } - void dictPut(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue) { + void dictPut(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue) { if (_self.is()) { return _self.as().dictPut(vm, feature, newValue); } else if (_self.isTransient()) { @@ -99,7 +99,7 @@ public: } } - class mozart::UnstableNode dictExchange(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue) { + mozart::UnstableNode dictExchange(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue) { if (_self.is()) { return _self.as().dictExchange(vm, feature, newValue); } else if (_self.isTransient()) { @@ -107,7 +107,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::DictionaryLike::dictExchange", "dictExchange", feature, newValue, ::mozart::ozcalls::out(_result))) return _result; } @@ -115,7 +115,7 @@ public: } } - class mozart::UnstableNode dictCondExchange(VM vm, class mozart::RichNode feature, class mozart::RichNode defaultValue, class mozart::RichNode newValue) { + mozart::UnstableNode dictCondExchange(mozart::VM vm, mozart::RichNode feature, mozart::RichNode defaultValue, mozart::RichNode newValue) { if (_self.is()) { return _self.as().dictCondExchange(vm, feature, defaultValue, newValue); } else if (_self.isTransient()) { @@ -123,7 +123,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::DictionaryLike::dictCondExchange", "dictCondExchange", feature, defaultValue, newValue, ::mozart::ozcalls::out(_result))) return _result; } @@ -131,7 +131,7 @@ public: } } - void dictRemove(VM vm, class mozart::RichNode feature) { + void dictRemove(mozart::VM vm, mozart::RichNode feature) { if (_self.is()) { return _self.as().dictRemove(vm, feature); } else if (_self.isTransient()) { @@ -146,7 +146,7 @@ public: } } - void dictRemoveAll(VM vm) { + void dictRemoveAll(mozart::VM vm) { if (_self.is()) { return _self.as().dictRemoveAll(vm); } else if (_self.isTransient()) { @@ -161,7 +161,7 @@ public: } } - class mozart::UnstableNode dictKeys(VM vm) { + mozart::UnstableNode dictKeys(mozart::VM vm) { if (_self.is()) { return _self.as().dictKeys(vm); } else if (_self.isTransient()) { @@ -169,7 +169,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::DictionaryLike::dictKeys", "dictKeys", ::mozart::ozcalls::out(_result))) return _result; } @@ -177,7 +177,7 @@ public: } } - class mozart::UnstableNode dictEntries(VM vm) { + mozart::UnstableNode dictEntries(mozart::VM vm) { if (_self.is()) { return _self.as().dictEntries(vm); } else if (_self.isTransient()) { @@ -185,7 +185,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::DictionaryLike::dictEntries", "dictEntries", ::mozart::ozcalls::out(_result))) return _result; } @@ -193,7 +193,7 @@ public: } } - class mozart::UnstableNode dictItems(VM vm) { + mozart::UnstableNode dictItems(mozart::VM vm) { if (_self.is()) { return _self.as().dictItems(vm); } else if (_self.isTransient()) { @@ -201,7 +201,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::DictionaryLike::dictItems", "dictItems", ::mozart::ozcalls::out(_result))) return _result; } @@ -209,7 +209,7 @@ public: } } - class mozart::UnstableNode dictClone(VM vm) { + mozart::UnstableNode dictClone(mozart::VM vm) { if (_self.is()) { return _self.as().dictClone(vm); } else if (_self.isTransient()) { @@ -217,7 +217,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::DictionaryLike::dictClone", "dictClone", ::mozart::ozcalls::out(_result))) return _result; } diff --git a/vm/boostenv/main/cached/DotAssignable-interf.hh b/vm/boostenv/main/cached/DotAssignable-interf.hh index 66ae750a6..c5a41bc7c 100644 --- a/vm/boostenv/main/cached/DotAssignable-interf.hh +++ b/vm/boostenv/main/cached/DotAssignable-interf.hh @@ -4,7 +4,7 @@ public: DotAssignable(UnstableNode& self) : _self(self) {} DotAssignable(StableNode& self) : _self(self) {} - void dotAssign(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue) { + void dotAssign(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue) { if (_self.is()) { return _self.as().dotAssign(vm, feature, newValue); } else if (_self.is()) { @@ -21,7 +21,7 @@ public: } } - class mozart::UnstableNode dotExchange(VM vm, class mozart::RichNode feature, class mozart::RichNode newValue) { + mozart::UnstableNode dotExchange(mozart::VM vm, mozart::RichNode feature, mozart::RichNode newValue) { if (_self.is()) { return _self.as().dotExchange(vm, feature, newValue); } else if (_self.is()) { @@ -31,7 +31,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::DotAssignable::dotExchange", "dotExchange", feature, newValue, ::mozart::ozcalls::out(_result))) return _result; } diff --git a/vm/boostenv/main/cached/FailedSpace-implem-decl-after.hh b/vm/boostenv/main/cached/FailedSpace-implem-decl-after.hh index 135b1978f..1be98382a 100644 --- a/vm/boostenv/main/cached/FailedSpace-implem-decl-after.hh +++ b/vm/boostenv/main/cached/FailedSpace-implem-decl-after.hh @@ -38,23 +38,23 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - bool isSpace(VM vm); + bool isSpace(mozart::VM vm); inline - class mozart::UnstableNode askSpace(VM vm); + mozart::UnstableNode askSpace(mozart::VM vm); inline - class mozart::UnstableNode askVerboseSpace(VM vm); + mozart::UnstableNode askVerboseSpace(mozart::VM vm); inline - class mozart::UnstableNode mergeSpace(VM vm); + mozart::UnstableNode mergeSpace(mozart::VM vm); inline - void commitSpace(VM vm, class mozart::RichNode value); + void commitSpace(mozart::VM vm, mozart::RichNode value); inline - class mozart::UnstableNode cloneSpace(VM vm); + mozart::UnstableNode cloneSpace(mozart::VM vm); inline - void killSpace(VM vm); + void killSpace(mozart::VM vm); }; diff --git a/vm/boostenv/main/cached/FailedSpace-implem-decl.hh b/vm/boostenv/main/cached/FailedSpace-implem-decl.hh index 331ad0949..ca053fd9e 100644 --- a/vm/boostenv/main/cached/FailedSpace-implem-decl.hh +++ b/vm/boostenv/main/cached/FailedSpace-implem-decl.hh @@ -3,5 +3,5 @@ class FailedSpace; template <> class Storage { public: - typedef struct mozart::unit_t Type; + typedef mozart::unit_t Type; }; diff --git a/vm/boostenv/main/cached/FailedSpace-implem.hh b/vm/boostenv/main/cached/FailedSpace-implem.hh index 0c00900b9..588ef9457 100644 --- a/vm/boostenv/main/cached/FailedSpace-implem.hh +++ b/vm/boostenv/main/cached/FailedSpace-implem.hh @@ -20,36 +20,36 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) con } inline -bool TypedRichNode::isSpace(VM vm) { +bool TypedRichNode::isSpace(mozart::VM vm) { return _self.access().isSpace(vm); } inline -class mozart::UnstableNode TypedRichNode::askSpace(VM vm) { +mozart::UnstableNode TypedRichNode::askSpace(mozart::VM vm) { return _self.access().askSpace(vm); } inline -class mozart::UnstableNode TypedRichNode::askVerboseSpace(VM vm) { +mozart::UnstableNode TypedRichNode::askVerboseSpace(mozart::VM vm) { return _self.access().askVerboseSpace(vm); } inline -class mozart::UnstableNode TypedRichNode::mergeSpace(VM vm) { +mozart::UnstableNode TypedRichNode::mergeSpace(mozart::VM vm) { return _self.access().mergeSpace(vm); } inline -void TypedRichNode::commitSpace(VM vm, class mozart::RichNode value) { +void TypedRichNode::commitSpace(mozart::VM vm, mozart::RichNode value) { _self.access().commitSpace(vm, value); } inline -class mozart::UnstableNode TypedRichNode::cloneSpace(VM vm) { +mozart::UnstableNode TypedRichNode::cloneSpace(mozart::VM vm) { return _self.access().cloneSpace(vm); } inline -void TypedRichNode::killSpace(VM vm) { +void TypedRichNode::killSpace(mozart::VM vm) { _self.access().killSpace(vm); } diff --git a/vm/boostenv/main/cached/FailedValue-implem-decl-after.hh b/vm/boostenv/main/cached/FailedValue-implem-decl-after.hh index 0653a8f01..6e3ab4033 100644 --- a/vm/boostenv/main/cached/FailedValue-implem-decl-after.hh +++ b/vm/boostenv/main/cached/FailedValue-implem-decl-after.hh @@ -38,23 +38,23 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::StableNode * getUnderlying(); + mozart::StableNode * getUnderlying(); inline - void raiseUnderlying(VM vm); + void raiseUnderlying(mozart::VM vm); inline - void addToSuspendList(VM vm, class mozart::RichNode variable); + void addToSuspendList(mozart::VM vm, mozart::RichNode variable); inline - bool isNeeded(VM vm); + bool isNeeded(mozart::VM vm); inline - void markNeeded(VM vm); + void markNeeded(mozart::VM vm); inline - void bind(VM vm, class mozart::RichNode src); + void bind(mozart::VM vm, mozart::RichNode src); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/FailedValue-implem-decl.hh b/vm/boostenv/main/cached/FailedValue-implem-decl.hh index 0b8df9f7a..2117d2b9f 100644 --- a/vm/boostenv/main/cached/FailedValue-implem-decl.hh +++ b/vm/boostenv/main/cached/FailedValue-implem-decl.hh @@ -3,5 +3,5 @@ class FailedValue; template <> class Storage { public: - typedef class mozart::StableNode * Type; + typedef mozart::StableNode * Type; }; diff --git a/vm/boostenv/main/cached/FailedValue-implem.hh b/vm/boostenv/main/cached/FailedValue-implem.hh index f23db8fd5..e71befc2f 100644 --- a/vm/boostenv/main/cached/FailedValue-implem.hh +++ b/vm/boostenv/main/cached/FailedValue-implem.hh @@ -12,9 +12,7 @@ void TypeInfoOf::gCollect(GC gc, RichNode from, StableNode& to) con void TypeInfoOf::gCollect(GC gc, RichNode from, UnstableNode& to) const { assert(from.type() == type()); - StableNode* stable = new (gc->vm) StableNode; - to.make(gc->vm, stable); - stable->make(gc->vm, gc, from.access()); + to.make(gc->vm, gc, from.access()); } void TypeInfoOf::sClone(SC sc, RichNode from, StableNode& to) const { @@ -28,36 +26,36 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) con } inline -class mozart::StableNode * TypedRichNode::getUnderlying() { +mozart::StableNode * TypedRichNode::getUnderlying() { return _self.access().getUnderlying(); } inline -void TypedRichNode::raiseUnderlying(VM vm) { +void TypedRichNode::raiseUnderlying(mozart::VM vm) { _self.access().raiseUnderlying(vm); } inline -void TypedRichNode::addToSuspendList(VM vm, class mozart::RichNode variable) { +void TypedRichNode::addToSuspendList(mozart::VM vm, mozart::RichNode variable) { _self.access().addToSuspendList(vm, variable); } inline -bool TypedRichNode::isNeeded(VM vm) { +bool TypedRichNode::isNeeded(mozart::VM vm) { return _self.access().isNeeded(vm); } inline -void TypedRichNode::markNeeded(VM vm) { +void TypedRichNode::markNeeded(mozart::VM vm) { _self.access().markNeeded(vm); } inline -void TypedRichNode::bind(VM vm, class mozart::RichNode src) { +void TypedRichNode::bind(mozart::VM vm, mozart::RichNode src) { _self.access().bind(vm, src); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/Float-implem-decl-after.hh b/vm/boostenv/main/cached/Float-implem-decl-after.hh index 9a618418b..442e4bc86 100644 --- a/vm/boostenv/main/cached/Float-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Float-implem-decl-after.hh @@ -45,131 +45,131 @@ public: double value(); inline - bool equals(VM vm, class mozart::RichNode right); + bool equals(mozart::VM vm, mozart::RichNode right); inline - int compare(VM vm, class mozart::RichNode right); + int compare(mozart::VM vm, mozart::RichNode right); inline - bool isNumber(VM vm); + bool isNumber(mozart::VM vm); inline - bool isInt(VM vm); + bool isInt(mozart::VM vm); inline - bool isFloat(VM vm); + bool isFloat(mozart::VM vm); inline - class mozart::UnstableNode opposite(VM vm); + mozart::UnstableNode opposite(mozart::VM vm); inline - class mozart::UnstableNode add(VM vm, class mozart::RichNode right); + mozart::UnstableNode add(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode add(VM vm, nativeint right); + mozart::UnstableNode add(mozart::VM vm, mozart::nativeint right); inline - class mozart::UnstableNode addValue(VM vm, double b); + mozart::UnstableNode addValue(mozart::VM vm, double b); inline - class mozart::UnstableNode subtract(VM vm, class mozart::RichNode right); + mozart::UnstableNode subtract(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode subtractValue(VM vm, double b); + mozart::UnstableNode subtractValue(mozart::VM vm, double b); inline - class mozart::UnstableNode multiply(VM vm, class mozart::RichNode right); + mozart::UnstableNode multiply(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode multiplyValue(VM vm, double b); + mozart::UnstableNode multiplyValue(mozart::VM vm, double b); inline - class mozart::UnstableNode divide(VM vm, class mozart::RichNode right); + mozart::UnstableNode divide(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode divideValue(VM vm, double b); + mozart::UnstableNode divideValue(mozart::VM vm, double b); inline - class mozart::UnstableNode fmod(VM vm, class mozart::RichNode right); + mozart::UnstableNode fmod(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode fmodValue(VM vm, double b); + mozart::UnstableNode fmodValue(mozart::VM vm, double b); inline - class mozart::UnstableNode div(VM vm, class mozart::RichNode right); + mozart::UnstableNode div(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode mod(VM vm, class mozart::RichNode right); + mozart::UnstableNode mod(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode pow(VM vm, class mozart::RichNode right); + mozart::UnstableNode pow(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode powValue(VM vm, double b); + mozart::UnstableNode powValue(mozart::VM vm, double b); inline - class mozart::UnstableNode abs(VM vm); + mozart::UnstableNode abs(mozart::VM vm); inline - class mozart::UnstableNode acos(VM vm); + mozart::UnstableNode acos(mozart::VM vm); inline - class mozart::UnstableNode acosh(VM vm); + mozart::UnstableNode acosh(mozart::VM vm); inline - class mozart::UnstableNode asin(VM vm); + mozart::UnstableNode asin(mozart::VM vm); inline - class mozart::UnstableNode asinh(VM vm); + mozart::UnstableNode asinh(mozart::VM vm); inline - class mozart::UnstableNode atan(VM vm); + mozart::UnstableNode atan(mozart::VM vm); inline - class mozart::UnstableNode atanh(VM vm); + mozart::UnstableNode atanh(mozart::VM vm); inline - class mozart::UnstableNode atan2(VM vm, class mozart::RichNode right); + mozart::UnstableNode atan2(mozart::VM vm, mozart::RichNode right); inline - class mozart::UnstableNode atan2Value(VM vm, double b); + mozart::UnstableNode atan2Value(mozart::VM vm, double b); inline - class mozart::UnstableNode ceil(VM vm); + mozart::UnstableNode ceil(mozart::VM vm); inline - class mozart::UnstableNode cos(VM vm); + mozart::UnstableNode cos(mozart::VM vm); inline - class mozart::UnstableNode cosh(VM vm); + mozart::UnstableNode cosh(mozart::VM vm); inline - class mozart::UnstableNode exp(VM vm); + mozart::UnstableNode exp(mozart::VM vm); inline - class mozart::UnstableNode floor(VM vm); + mozart::UnstableNode floor(mozart::VM vm); inline - class mozart::UnstableNode log(VM vm); + mozart::UnstableNode log(mozart::VM vm); inline - class mozart::UnstableNode round(VM vm); + mozart::UnstableNode round(mozart::VM vm); inline - class mozart::UnstableNode sin(VM vm); + mozart::UnstableNode sin(mozart::VM vm); inline - class mozart::UnstableNode sinh(VM vm); + mozart::UnstableNode sinh(mozart::VM vm); inline - class mozart::UnstableNode sqrt(VM vm); + mozart::UnstableNode sqrt(mozart::VM vm); inline - class mozart::UnstableNode tan(VM vm); + mozart::UnstableNode tan(mozart::VM vm); inline - class mozart::UnstableNode tanh(VM vm); + mozart::UnstableNode tanh(mozart::VM vm); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/Float-implem.hh b/vm/boostenv/main/cached/Float-implem.hh index 80b8de832..70319222b 100644 --- a/vm/boostenv/main/cached/Float-implem.hh +++ b/vm/boostenv/main/cached/Float-implem.hh @@ -31,216 +31,216 @@ double TypedRichNode::value() { } inline -bool TypedRichNode::equals(VM vm, class mozart::RichNode right) { +bool TypedRichNode::equals(mozart::VM vm, mozart::RichNode right) { return _self.access().equals(vm, right); } inline -int TypedRichNode::compare(VM vm, class mozart::RichNode right) { +int TypedRichNode::compare(mozart::VM vm, mozart::RichNode right) { return _self.access().compare(vm, right); } inline -bool TypedRichNode::isNumber(VM vm) { +bool TypedRichNode::isNumber(mozart::VM vm) { return _self.access().isNumber(vm); } inline -bool TypedRichNode::isInt(VM vm) { +bool TypedRichNode::isInt(mozart::VM vm) { return _self.access().isInt(vm); } inline -bool TypedRichNode::isFloat(VM vm) { +bool TypedRichNode::isFloat(mozart::VM vm) { return _self.access().isFloat(vm); } inline -class mozart::UnstableNode TypedRichNode::opposite(VM vm) { +mozart::UnstableNode TypedRichNode::opposite(mozart::VM vm) { return _self.access().opposite(vm); } inline -class mozart::UnstableNode TypedRichNode::add(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::add(mozart::VM vm, mozart::RichNode right) { return _self.access().add(vm, right); } inline -class mozart::UnstableNode TypedRichNode::add(VM vm, nativeint right) { +mozart::UnstableNode TypedRichNode::add(mozart::VM vm, mozart::nativeint right) { return _self.access().add(_self, vm, right); } inline -class mozart::UnstableNode TypedRichNode::addValue(VM vm, double b) { +mozart::UnstableNode TypedRichNode::addValue(mozart::VM vm, double b) { return _self.access().addValue(vm, b); } inline -class mozart::UnstableNode TypedRichNode::subtract(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::subtract(mozart::VM vm, mozart::RichNode right) { return _self.access().subtract(vm, right); } inline -class mozart::UnstableNode TypedRichNode::subtractValue(VM vm, double b) { +mozart::UnstableNode TypedRichNode::subtractValue(mozart::VM vm, double b) { return _self.access().subtractValue(vm, b); } inline -class mozart::UnstableNode TypedRichNode::multiply(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::multiply(mozart::VM vm, mozart::RichNode right) { return _self.access().multiply(vm, right); } inline -class mozart::UnstableNode TypedRichNode::multiplyValue(VM vm, double b) { +mozart::UnstableNode TypedRichNode::multiplyValue(mozart::VM vm, double b) { return _self.access().multiplyValue(vm, b); } inline -class mozart::UnstableNode TypedRichNode::divide(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::divide(mozart::VM vm, mozart::RichNode right) { return _self.access().divide(vm, right); } inline -class mozart::UnstableNode TypedRichNode::divideValue(VM vm, double b) { +mozart::UnstableNode TypedRichNode::divideValue(mozart::VM vm, double b) { return _self.access().divideValue(vm, b); } inline -class mozart::UnstableNode TypedRichNode::fmod(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::fmod(mozart::VM vm, mozart::RichNode right) { return _self.access().fmod(vm, right); } inline -class mozart::UnstableNode TypedRichNode::fmodValue(VM vm, double b) { +mozart::UnstableNode TypedRichNode::fmodValue(mozart::VM vm, double b) { return _self.access().fmodValue(vm, b); } inline -class mozart::UnstableNode TypedRichNode::div(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::div(mozart::VM vm, mozart::RichNode right) { return _self.access().div(_self, vm, right); } inline -class mozart::UnstableNode TypedRichNode::mod(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::mod(mozart::VM vm, mozart::RichNode right) { return _self.access().mod(_self, vm, right); } inline -class mozart::UnstableNode TypedRichNode::pow(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::pow(mozart::VM vm, mozart::RichNode right) { return _self.access().pow(vm, right); } inline -class mozart::UnstableNode TypedRichNode::powValue(VM vm, double b) { +mozart::UnstableNode TypedRichNode::powValue(mozart::VM vm, double b) { return _self.access().powValue(vm, b); } inline -class mozart::UnstableNode TypedRichNode::abs(VM vm) { +mozart::UnstableNode TypedRichNode::abs(mozart::VM vm) { return _self.access().abs(vm); } inline -class mozart::UnstableNode TypedRichNode::acos(VM vm) { +mozart::UnstableNode TypedRichNode::acos(mozart::VM vm) { return _self.access().acos(vm); } inline -class mozart::UnstableNode TypedRichNode::acosh(VM vm) { +mozart::UnstableNode TypedRichNode::acosh(mozart::VM vm) { return _self.access().acosh(vm); } inline -class mozart::UnstableNode TypedRichNode::asin(VM vm) { +mozart::UnstableNode TypedRichNode::asin(mozart::VM vm) { return _self.access().asin(vm); } inline -class mozart::UnstableNode TypedRichNode::asinh(VM vm) { +mozart::UnstableNode TypedRichNode::asinh(mozart::VM vm) { return _self.access().asinh(vm); } inline -class mozart::UnstableNode TypedRichNode::atan(VM vm) { +mozart::UnstableNode TypedRichNode::atan(mozart::VM vm) { return _self.access().atan(vm); } inline -class mozart::UnstableNode TypedRichNode::atanh(VM vm) { +mozart::UnstableNode TypedRichNode::atanh(mozart::VM vm) { return _self.access().atanh(vm); } inline -class mozart::UnstableNode TypedRichNode::atan2(VM vm, class mozart::RichNode right) { +mozart::UnstableNode TypedRichNode::atan2(mozart::VM vm, mozart::RichNode right) { return _self.access().atan2(vm, right); } inline -class mozart::UnstableNode TypedRichNode::atan2Value(VM vm, double b) { +mozart::UnstableNode TypedRichNode::atan2Value(mozart::VM vm, double b) { return _self.access().atan2Value(vm, b); } inline -class mozart::UnstableNode TypedRichNode::ceil(VM vm) { +mozart::UnstableNode TypedRichNode::ceil(mozart::VM vm) { return _self.access().ceil(vm); } inline -class mozart::UnstableNode TypedRichNode::cos(VM vm) { +mozart::UnstableNode TypedRichNode::cos(mozart::VM vm) { return _self.access().cos(vm); } inline -class mozart::UnstableNode TypedRichNode::cosh(VM vm) { +mozart::UnstableNode TypedRichNode::cosh(mozart::VM vm) { return _self.access().cosh(vm); } inline -class mozart::UnstableNode TypedRichNode::exp(VM vm) { +mozart::UnstableNode TypedRichNode::exp(mozart::VM vm) { return _self.access().exp(vm); } inline -class mozart::UnstableNode TypedRichNode::floor(VM vm) { +mozart::UnstableNode TypedRichNode::floor(mozart::VM vm) { return _self.access().floor(vm); } inline -class mozart::UnstableNode TypedRichNode::log(VM vm) { +mozart::UnstableNode TypedRichNode::log(mozart::VM vm) { return _self.access().log(vm); } inline -class mozart::UnstableNode TypedRichNode::round(VM vm) { +mozart::UnstableNode TypedRichNode::round(mozart::VM vm) { return _self.access().round(vm); } inline -class mozart::UnstableNode TypedRichNode::sin(VM vm) { +mozart::UnstableNode TypedRichNode::sin(mozart::VM vm) { return _self.access().sin(vm); } inline -class mozart::UnstableNode TypedRichNode::sinh(VM vm) { +mozart::UnstableNode TypedRichNode::sinh(mozart::VM vm) { return _self.access().sinh(vm); } inline -class mozart::UnstableNode TypedRichNode::sqrt(VM vm) { +mozart::UnstableNode TypedRichNode::sqrt(mozart::VM vm) { return _self.access().sqrt(vm); } inline -class mozart::UnstableNode TypedRichNode::tan(VM vm) { +mozart::UnstableNode TypedRichNode::tan(mozart::VM vm) { return _self.access().tan(vm); } inline -class mozart::UnstableNode TypedRichNode::tanh(VM vm) { +mozart::UnstableNode TypedRichNode::tanh(mozart::VM vm) { return _self.access().tanh(vm); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/FloatLike-interf.hh b/vm/boostenv/main/cached/FloatLike-interf.hh index 5ed019bcb..378ed579a 100644 --- a/vm/boostenv/main/cached/FloatLike-interf.hh +++ b/vm/boostenv/main/cached/FloatLike-interf.hh @@ -4,7 +4,7 @@ public: FloatLike(UnstableNode& self) : _self(self) {} FloatLike(StableNode& self) : _self(self) {} - class mozart::UnstableNode divide(VM vm, class mozart::RichNode right) { + mozart::UnstableNode divide(mozart::VM vm, mozart::RichNode right) { if (_self.is()) { return _self.as().divide(vm, right); } else if (_self.isTransient()) { @@ -12,7 +12,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::divide", "divide", right, ::mozart::ozcalls::out(_result))) return _result; } @@ -20,7 +20,7 @@ public: } } - class mozart::UnstableNode pow(VM vm, class mozart::RichNode right) { + mozart::UnstableNode pow(mozart::VM vm, mozart::RichNode right) { if (_self.is()) { return _self.as().pow(vm, right); } else if (_self.isTransient()) { @@ -28,7 +28,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::pow", "pow", right, ::mozart::ozcalls::out(_result))) return _result; } @@ -36,7 +36,7 @@ public: } } - class mozart::UnstableNode fmod(VM vm, class mozart::RichNode right) { + mozart::UnstableNode fmod(mozart::VM vm, mozart::RichNode right) { if (_self.is()) { return _self.as().fmod(vm, right); } else if (_self.isTransient()) { @@ -44,7 +44,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::fmod", "fmod", right, ::mozart::ozcalls::out(_result))) return _result; } @@ -52,7 +52,7 @@ public: } } - class mozart::UnstableNode acos(VM vm) { + mozart::UnstableNode acos(mozart::VM vm) { if (_self.is()) { return _self.as().acos(vm); } else if (_self.isTransient()) { @@ -60,7 +60,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::acos", "acos", ::mozart::ozcalls::out(_result))) return _result; } @@ -68,7 +68,7 @@ public: } } - class mozart::UnstableNode acosh(VM vm) { + mozart::UnstableNode acosh(mozart::VM vm) { if (_self.is()) { return _self.as().acosh(vm); } else if (_self.isTransient()) { @@ -76,7 +76,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::acosh", "acosh", ::mozart::ozcalls::out(_result))) return _result; } @@ -84,7 +84,7 @@ public: } } - class mozart::UnstableNode asin(VM vm) { + mozart::UnstableNode asin(mozart::VM vm) { if (_self.is()) { return _self.as().asin(vm); } else if (_self.isTransient()) { @@ -92,7 +92,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::asin", "asin", ::mozart::ozcalls::out(_result))) return _result; } @@ -100,7 +100,7 @@ public: } } - class mozart::UnstableNode asinh(VM vm) { + mozart::UnstableNode asinh(mozart::VM vm) { if (_self.is()) { return _self.as().asinh(vm); } else if (_self.isTransient()) { @@ -108,7 +108,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::asinh", "asinh", ::mozart::ozcalls::out(_result))) return _result; } @@ -116,7 +116,7 @@ public: } } - class mozart::UnstableNode atan(VM vm) { + mozart::UnstableNode atan(mozart::VM vm) { if (_self.is()) { return _self.as().atan(vm); } else if (_self.isTransient()) { @@ -124,7 +124,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::atan", "atan", ::mozart::ozcalls::out(_result))) return _result; } @@ -132,7 +132,7 @@ public: } } - class mozart::UnstableNode atanh(VM vm) { + mozart::UnstableNode atanh(mozart::VM vm) { if (_self.is()) { return _self.as().atanh(vm); } else if (_self.isTransient()) { @@ -140,7 +140,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::atanh", "atanh", ::mozart::ozcalls::out(_result))) return _result; } @@ -148,7 +148,7 @@ public: } } - class mozart::UnstableNode atan2(VM vm, class mozart::RichNode right) { + mozart::UnstableNode atan2(mozart::VM vm, mozart::RichNode right) { if (_self.is()) { return _self.as().atan2(vm, right); } else if (_self.isTransient()) { @@ -156,7 +156,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::atan2", "atan2", right, ::mozart::ozcalls::out(_result))) return _result; } @@ -164,7 +164,7 @@ public: } } - class mozart::UnstableNode ceil(VM vm) { + mozart::UnstableNode ceil(mozart::VM vm) { if (_self.is()) { return _self.as().ceil(vm); } else if (_self.isTransient()) { @@ -172,7 +172,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::ceil", "ceil", ::mozart::ozcalls::out(_result))) return _result; } @@ -180,7 +180,7 @@ public: } } - class mozart::UnstableNode cos(VM vm) { + mozart::UnstableNode cos(mozart::VM vm) { if (_self.is()) { return _self.as().cos(vm); } else if (_self.isTransient()) { @@ -188,7 +188,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::cos", "cos", ::mozart::ozcalls::out(_result))) return _result; } @@ -196,7 +196,7 @@ public: } } - class mozart::UnstableNode cosh(VM vm) { + mozart::UnstableNode cosh(mozart::VM vm) { if (_self.is()) { return _self.as().cosh(vm); } else if (_self.isTransient()) { @@ -204,7 +204,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::cosh", "cosh", ::mozart::ozcalls::out(_result))) return _result; } @@ -212,7 +212,7 @@ public: } } - class mozart::UnstableNode exp(VM vm) { + mozart::UnstableNode exp(mozart::VM vm) { if (_self.is()) { return _self.as().exp(vm); } else if (_self.isTransient()) { @@ -220,7 +220,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::exp", "exp", ::mozart::ozcalls::out(_result))) return _result; } @@ -228,7 +228,7 @@ public: } } - class mozart::UnstableNode floor(VM vm) { + mozart::UnstableNode floor(mozart::VM vm) { if (_self.is()) { return _self.as().floor(vm); } else if (_self.isTransient()) { @@ -236,7 +236,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::floor", "floor", ::mozart::ozcalls::out(_result))) return _result; } @@ -244,7 +244,7 @@ public: } } - class mozart::UnstableNode log(VM vm) { + mozart::UnstableNode log(mozart::VM vm) { if (_self.is()) { return _self.as().log(vm); } else if (_self.isTransient()) { @@ -252,7 +252,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::log", "log", ::mozart::ozcalls::out(_result))) return _result; } @@ -260,7 +260,7 @@ public: } } - class mozart::UnstableNode round(VM vm) { + mozart::UnstableNode round(mozart::VM vm) { if (_self.is()) { return _self.as().round(vm); } else if (_self.isTransient()) { @@ -268,7 +268,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::round", "round", ::mozart::ozcalls::out(_result))) return _result; } @@ -276,7 +276,7 @@ public: } } - class mozart::UnstableNode sin(VM vm) { + mozart::UnstableNode sin(mozart::VM vm) { if (_self.is()) { return _self.as().sin(vm); } else if (_self.isTransient()) { @@ -284,7 +284,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::sin", "sin", ::mozart::ozcalls::out(_result))) return _result; } @@ -292,7 +292,7 @@ public: } } - class mozart::UnstableNode sinh(VM vm) { + mozart::UnstableNode sinh(mozart::VM vm) { if (_self.is()) { return _self.as().sinh(vm); } else if (_self.isTransient()) { @@ -300,7 +300,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::sinh", "sinh", ::mozart::ozcalls::out(_result))) return _result; } @@ -308,7 +308,7 @@ public: } } - class mozart::UnstableNode sqrt(VM vm) { + mozart::UnstableNode sqrt(mozart::VM vm) { if (_self.is()) { return _self.as().sqrt(vm); } else if (_self.isTransient()) { @@ -316,7 +316,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::sqrt", "sqrt", ::mozart::ozcalls::out(_result))) return _result; } @@ -324,7 +324,7 @@ public: } } - class mozart::UnstableNode tan(VM vm) { + mozart::UnstableNode tan(mozart::VM vm) { if (_self.is()) { return _self.as().tan(vm); } else if (_self.isTransient()) { @@ -332,7 +332,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::tan", "tan", ::mozart::ozcalls::out(_result))) return _result; } @@ -340,7 +340,7 @@ public: } } - class mozart::UnstableNode tanh(VM vm) { + mozart::UnstableNode tanh(mozart::VM vm) { if (_self.is()) { return _self.as().tanh(vm); } else if (_self.isTransient()) { @@ -348,7 +348,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::FloatLike::tanh", "tanh", ::mozart::ozcalls::out(_result))) return _result; } diff --git a/vm/boostenv/main/cached/GRedToStable-implem-decl-after.hh b/vm/boostenv/main/cached/GRedToStable-implem-decl-after.hh index 1e6f61480..d770190bd 100644 --- a/vm/boostenv/main/cached/GRedToStable-implem-decl-after.hh +++ b/vm/boostenv/main/cached/GRedToStable-implem-decl-after.hh @@ -22,5 +22,5 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::StableNode * dest(); + mozart::StableNode * dest(); }; diff --git a/vm/boostenv/main/cached/GRedToStable-implem-decl.hh b/vm/boostenv/main/cached/GRedToStable-implem-decl.hh index daad688fd..8a239de87 100644 --- a/vm/boostenv/main/cached/GRedToStable-implem-decl.hh +++ b/vm/boostenv/main/cached/GRedToStable-implem-decl.hh @@ -3,5 +3,5 @@ class GRedToStable; template <> class Storage { public: - typedef class mozart::StableNode * Type; + typedef mozart::StableNode * Type; }; diff --git a/vm/boostenv/main/cached/GRedToStable-implem.hh b/vm/boostenv/main/cached/GRedToStable-implem.hh index 1f13544ad..8991ab6a7 100644 --- a/vm/boostenv/main/cached/GRedToStable-implem.hh +++ b/vm/boostenv/main/cached/GRedToStable-implem.hh @@ -1,5 +1,5 @@ inline -class mozart::StableNode * TypedRichNode::dest() { +mozart::StableNode * TypedRichNode::dest() { return _self.access().dest(); } diff --git a/vm/boostenv/main/cached/GRedToUnstable-implem-decl-after.hh b/vm/boostenv/main/cached/GRedToUnstable-implem-decl-after.hh index f3b6b92f0..12e0cfaec 100644 --- a/vm/boostenv/main/cached/GRedToUnstable-implem-decl-after.hh +++ b/vm/boostenv/main/cached/GRedToUnstable-implem-decl-after.hh @@ -22,5 +22,5 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::UnstableNode * dest(); + mozart::UnstableNode * dest(); }; diff --git a/vm/boostenv/main/cached/GRedToUnstable-implem-decl.hh b/vm/boostenv/main/cached/GRedToUnstable-implem-decl.hh index 853fbcf76..31dcdde51 100644 --- a/vm/boostenv/main/cached/GRedToUnstable-implem-decl.hh +++ b/vm/boostenv/main/cached/GRedToUnstable-implem-decl.hh @@ -3,5 +3,5 @@ class GRedToUnstable; template <> class Storage { public: - typedef class mozart::UnstableNode * Type; + typedef mozart::UnstableNode * Type; }; diff --git a/vm/boostenv/main/cached/GRedToUnstable-implem.hh b/vm/boostenv/main/cached/GRedToUnstable-implem.hh index 25623d55d..f2b8cb91a 100644 --- a/vm/boostenv/main/cached/GRedToUnstable-implem.hh +++ b/vm/boostenv/main/cached/GRedToUnstable-implem.hh @@ -1,5 +1,5 @@ inline -class mozart::UnstableNode * TypedRichNode::dest() { +mozart::UnstableNode * TypedRichNode::dest() { return _self.access().dest(); } diff --git a/vm/boostenv/main/cached/GlobalName-implem-decl-after.hh b/vm/boostenv/main/cached/GlobalName-implem-decl-after.hh index e1af26e47..2a40df500 100644 --- a/vm/boostenv/main/cached/GlobalName-implem-decl-after.hh +++ b/vm/boostenv/main/cached/GlobalName-implem-decl-after.hh @@ -48,59 +48,59 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::Space * home(); + mozart::Space * home(); inline - bool isLiteral(VM vm); + bool isLiteral(mozart::VM vm); inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline - bool isRecord(VM vm); + bool isRecord(mozart::VM vm); inline - bool isTuple(VM vm); + bool isTuple(mozart::VM vm); inline - class mozart::UnstableNode label(VM vm); + mozart::UnstableNode label(mozart::VM vm); inline - size_t width(VM vm); + size_t width(mozart::VM vm); inline - class mozart::UnstableNode arityList(VM vm); + mozart::UnstableNode arityList(mozart::VM vm); inline - class mozart::UnstableNode clone(VM vm); + mozart::UnstableNode clone(mozart::VM vm); inline - class mozart::UnstableNode waitOr(VM vm); + mozart::UnstableNode waitOr(mozart::VM vm); inline - bool testRecord(VM vm, class mozart::RichNode arity); + bool testRecord(mozart::VM vm, mozart::RichNode arity); inline - bool testTuple(VM vm, class mozart::RichNode label, size_t width); + bool testTuple(mozart::VM vm, mozart::RichNode label, size_t width); inline - bool testLabel(VM vm, class mozart::RichNode label); + bool testLabel(mozart::VM vm, mozart::RichNode label); inline - const struct mozart::UUID & getUUID(); + const mozart::UUID & getUUID(); inline - int compareFeatures(VM vm, class mozart::RichNode right); + int compareFeatures(mozart::VM vm, mozart::RichNode right); inline - bool isName(VM vm); + bool isName(mozart::VM vm); inline - class mozart::GlobalNode * globalize(VM vm); + mozart::GlobalNode * globalize(mozart::VM vm); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/GlobalName-implem.hh b/vm/boostenv/main/cached/GlobalName-implem.hh index e4e1a44bc..88bd11044 100644 --- a/vm/boostenv/main/cached/GlobalName-implem.hh +++ b/vm/boostenv/main/cached/GlobalName-implem.hh @@ -44,96 +44,96 @@ int TypeInfoOf::compareFeatures(VM vm, RichNode lhs, RichNode rhs) c inline -class mozart::Space * TypedRichNode::home() { +mozart::Space * TypedRichNode::home() { return _self.access().home(); } inline -bool TypedRichNode::isLiteral(VM vm) { +bool TypedRichNode::isLiteral(mozart::VM vm) { return _self.access().isLiteral(vm); } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::isRecord(VM vm) { +bool TypedRichNode::isRecord(mozart::VM vm) { return _self.access().isRecord(vm); } inline -bool TypedRichNode::isTuple(VM vm) { +bool TypedRichNode::isTuple(mozart::VM vm) { return _self.access().isTuple(vm); } inline -class mozart::UnstableNode TypedRichNode::label(VM vm) { +mozart::UnstableNode TypedRichNode::label(mozart::VM vm) { return _self.access().label(_self, vm); } inline -size_t TypedRichNode::width(VM vm) { +size_t TypedRichNode::width(mozart::VM vm) { return _self.access().width(vm); } inline -class mozart::UnstableNode TypedRichNode::arityList(VM vm) { +mozart::UnstableNode TypedRichNode::arityList(mozart::VM vm) { return _self.access().arityList(vm); } inline -class mozart::UnstableNode TypedRichNode::clone(VM vm) { +mozart::UnstableNode TypedRichNode::clone(mozart::VM vm) { return _self.access().clone(_self, vm); } inline -class mozart::UnstableNode TypedRichNode::waitOr(VM vm) { +mozart::UnstableNode TypedRichNode::waitOr(mozart::VM vm) { return _self.access().waitOr(vm); } inline -bool TypedRichNode::testRecord(VM vm, class mozart::RichNode arity) { +bool TypedRichNode::testRecord(mozart::VM vm, mozart::RichNode arity) { return _self.access().testRecord(vm, arity); } inline -bool TypedRichNode::testTuple(VM vm, class mozart::RichNode label, size_t width) { +bool TypedRichNode::testTuple(mozart::VM vm, mozart::RichNode label, size_t width) { return _self.access().testTuple(_self, vm, label, width); } inline -bool TypedRichNode::testLabel(VM vm, class mozart::RichNode label) { +bool TypedRichNode::testLabel(mozart::VM vm, mozart::RichNode label) { return _self.access().testLabel(_self, vm, label); } inline -const struct mozart::UUID & TypedRichNode::getUUID() { +const mozart::UUID & TypedRichNode::getUUID() { return _self.access().getUUID(); } inline -int TypedRichNode::compareFeatures(VM vm, class mozart::RichNode right) { +int TypedRichNode::compareFeatures(mozart::VM vm, mozart::RichNode right) { return _self.access().compareFeatures(vm, right); } inline -bool TypedRichNode::isName(VM vm) { +bool TypedRichNode::isName(mozart::VM vm) { return _self.access().isName(vm); } inline -class mozart::GlobalNode * TypedRichNode::globalize(VM vm) { +mozart::GlobalNode * TypedRichNode::globalize(mozart::VM vm) { return _self.access().globalize(_self, vm); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/Literal-interf.hh b/vm/boostenv/main/cached/Literal-interf.hh index f0a885d9d..30f51823c 100644 --- a/vm/boostenv/main/cached/Literal-interf.hh +++ b/vm/boostenv/main/cached/Literal-interf.hh @@ -4,7 +4,7 @@ public: Literal(UnstableNode& self) : _self(self) {} Literal(StableNode& self) : _self(self) {} - bool isLiteral(VM vm) { + bool isLiteral(mozart::VM vm) { if (_self.is()) { return _self.as().isLiteral(vm); } else if (_self.is()) { diff --git a/vm/boostenv/main/cached/MergedSpace-implem-decl-after.hh b/vm/boostenv/main/cached/MergedSpace-implem-decl-after.hh index 3bde0a933..557923f3a 100644 --- a/vm/boostenv/main/cached/MergedSpace-implem-decl-after.hh +++ b/vm/boostenv/main/cached/MergedSpace-implem-decl-after.hh @@ -38,23 +38,23 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - bool isSpace(VM vm); + bool isSpace(mozart::VM vm); inline - class mozart::UnstableNode askSpace(VM vm); + mozart::UnstableNode askSpace(mozart::VM vm); inline - class mozart::UnstableNode askVerboseSpace(VM vm); + mozart::UnstableNode askVerboseSpace(mozart::VM vm); inline - class mozart::UnstableNode mergeSpace(VM vm); + mozart::UnstableNode mergeSpace(mozart::VM vm); inline - void commitSpace(VM vm, class mozart::RichNode value); + void commitSpace(mozart::VM vm, mozart::RichNode value); inline - class mozart::UnstableNode cloneSpace(VM vm); + mozart::UnstableNode cloneSpace(mozart::VM vm); inline - void killSpace(VM vm); + void killSpace(mozart::VM vm); }; diff --git a/vm/boostenv/main/cached/MergedSpace-implem-decl.hh b/vm/boostenv/main/cached/MergedSpace-implem-decl.hh index aff5c8efb..03469ff4c 100644 --- a/vm/boostenv/main/cached/MergedSpace-implem-decl.hh +++ b/vm/boostenv/main/cached/MergedSpace-implem-decl.hh @@ -3,5 +3,5 @@ class MergedSpace; template <> class Storage { public: - typedef struct mozart::unit_t Type; + typedef mozart::unit_t Type; }; diff --git a/vm/boostenv/main/cached/MergedSpace-implem.hh b/vm/boostenv/main/cached/MergedSpace-implem.hh index bb4e3744d..4ef9df96d 100644 --- a/vm/boostenv/main/cached/MergedSpace-implem.hh +++ b/vm/boostenv/main/cached/MergedSpace-implem.hh @@ -20,36 +20,36 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) con } inline -bool TypedRichNode::isSpace(VM vm) { +bool TypedRichNode::isSpace(mozart::VM vm) { return _self.access().isSpace(vm); } inline -class mozart::UnstableNode TypedRichNode::askSpace(VM vm) { +mozart::UnstableNode TypedRichNode::askSpace(mozart::VM vm) { return _self.access().askSpace(vm); } inline -class mozart::UnstableNode TypedRichNode::askVerboseSpace(VM vm) { +mozart::UnstableNode TypedRichNode::askVerboseSpace(mozart::VM vm) { return _self.access().askVerboseSpace(vm); } inline -class mozart::UnstableNode TypedRichNode::mergeSpace(VM vm) { +mozart::UnstableNode TypedRichNode::mergeSpace(mozart::VM vm) { return _self.access().mergeSpace(vm); } inline -void TypedRichNode::commitSpace(VM vm, class mozart::RichNode value) { +void TypedRichNode::commitSpace(mozart::VM vm, mozart::RichNode value) { _self.access().commitSpace(vm, value); } inline -class mozart::UnstableNode TypedRichNode::cloneSpace(VM vm) { +mozart::UnstableNode TypedRichNode::cloneSpace(mozart::VM vm) { return _self.access().cloneSpace(vm); } inline -void TypedRichNode::killSpace(VM vm) { +void TypedRichNode::killSpace(mozart::VM vm) { _self.access().killSpace(vm); } diff --git a/vm/boostenv/main/cached/NameLike-interf.hh b/vm/boostenv/main/cached/NameLike-interf.hh index e5c82d4e6..72b138925 100644 --- a/vm/boostenv/main/cached/NameLike-interf.hh +++ b/vm/boostenv/main/cached/NameLike-interf.hh @@ -4,7 +4,7 @@ public: NameLike(UnstableNode& self) : _self(self) {} NameLike(StableNode& self) : _self(self) {} - bool isName(VM vm) { + bool isName(mozart::VM vm) { if (_self.is()) { return _self.as().isName(vm); } else if (_self.is()) { diff --git a/vm/boostenv/main/cached/NamedName-implem-decl-after.hh b/vm/boostenv/main/cached/NamedName-implem-decl-after.hh index bd92add5e..2c981f9a8 100644 --- a/vm/boostenv/main/cached/NamedName-implem-decl-after.hh +++ b/vm/boostenv/main/cached/NamedName-implem-decl-after.hh @@ -51,65 +51,65 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::Space * home(); + mozart::Space * home(); inline - bool isLiteral(VM vm); + bool isLiteral(mozart::VM vm); inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline - bool isRecord(VM vm); + bool isRecord(mozart::VM vm); inline - bool isTuple(VM vm); + bool isTuple(mozart::VM vm); inline - class mozart::UnstableNode label(VM vm); + mozart::UnstableNode label(mozart::VM vm); inline - size_t width(VM vm); + size_t width(mozart::VM vm); inline - class mozart::UnstableNode arityList(VM vm); + mozart::UnstableNode arityList(mozart::VM vm); inline - class mozart::UnstableNode clone(VM vm); + mozart::UnstableNode clone(mozart::VM vm); inline - class mozart::UnstableNode waitOr(VM vm); + mozart::UnstableNode waitOr(mozart::VM vm); inline - bool testRecord(VM vm, class mozart::RichNode arity); + bool testRecord(mozart::VM vm, mozart::RichNode arity); inline - bool testTuple(VM vm, class mozart::RichNode label, size_t width); + bool testTuple(mozart::VM vm, mozart::RichNode label, size_t width); inline - bool testLabel(VM vm, class mozart::RichNode label); + bool testLabel(mozart::VM vm, mozart::RichNode label); inline - const struct mozart::UUID & getUUID(); + const mozart::UUID & getUUID(); inline - int compareFeatures(VM vm, class mozart::RichNode right); + int compareFeatures(mozart::VM vm, mozart::RichNode right); inline - atom_t getPrintName(VM vm); + mozart::atom_t getPrintName(mozart::VM vm); inline - bool isName(VM vm); + bool isName(mozart::VM vm); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); inline - class mozart::GlobalNode * globalize(VM vm); + mozart::GlobalNode * globalize(mozart::VM vm); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/NamedName-implem.hh b/vm/boostenv/main/cached/NamedName-implem.hh index 322a89afa..1fcc1a859 100644 --- a/vm/boostenv/main/cached/NamedName-implem.hh +++ b/vm/boostenv/main/cached/NamedName-implem.hh @@ -49,106 +49,106 @@ int TypeInfoOf::compareFeatures(VM vm, RichNode lhs, RichNode rhs) co inline -class mozart::Space * TypedRichNode::home() { +mozart::Space * TypedRichNode::home() { return _self.access().home(); } inline -bool TypedRichNode::isLiteral(VM vm) { +bool TypedRichNode::isLiteral(mozart::VM vm) { return _self.access().isLiteral(vm); } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::isRecord(VM vm) { +bool TypedRichNode::isRecord(mozart::VM vm) { return _self.access().isRecord(vm); } inline -bool TypedRichNode::isTuple(VM vm) { +bool TypedRichNode::isTuple(mozart::VM vm) { return _self.access().isTuple(vm); } inline -class mozart::UnstableNode TypedRichNode::label(VM vm) { +mozart::UnstableNode TypedRichNode::label(mozart::VM vm) { return _self.access().label(_self, vm); } inline -size_t TypedRichNode::width(VM vm) { +size_t TypedRichNode::width(mozart::VM vm) { return _self.access().width(vm); } inline -class mozart::UnstableNode TypedRichNode::arityList(VM vm) { +mozart::UnstableNode TypedRichNode::arityList(mozart::VM vm) { return _self.access().arityList(vm); } inline -class mozart::UnstableNode TypedRichNode::clone(VM vm) { +mozart::UnstableNode TypedRichNode::clone(mozart::VM vm) { return _self.access().clone(_self, vm); } inline -class mozart::UnstableNode TypedRichNode::waitOr(VM vm) { +mozart::UnstableNode TypedRichNode::waitOr(mozart::VM vm) { return _self.access().waitOr(vm); } inline -bool TypedRichNode::testRecord(VM vm, class mozart::RichNode arity) { +bool TypedRichNode::testRecord(mozart::VM vm, mozart::RichNode arity) { return _self.access().testRecord(vm, arity); } inline -bool TypedRichNode::testTuple(VM vm, class mozart::RichNode label, size_t width) { +bool TypedRichNode::testTuple(mozart::VM vm, mozart::RichNode label, size_t width) { return _self.access().testTuple(_self, vm, label, width); } inline -bool TypedRichNode::testLabel(VM vm, class mozart::RichNode label) { +bool TypedRichNode::testLabel(mozart::VM vm, mozart::RichNode label) { return _self.access().testLabel(_self, vm, label); } inline -const struct mozart::UUID & TypedRichNode::getUUID() { +const mozart::UUID & TypedRichNode::getUUID() { return _self.access().getUUID(); } inline -int TypedRichNode::compareFeatures(VM vm, class mozart::RichNode right) { +int TypedRichNode::compareFeatures(mozart::VM vm, mozart::RichNode right) { return _self.access().compareFeatures(vm, right); } inline -atom_t TypedRichNode::getPrintName(VM vm) { +mozart::atom_t TypedRichNode::getPrintName(mozart::VM vm) { return _self.access().getPrintName(vm); } inline -bool TypedRichNode::isName(VM vm) { +bool TypedRichNode::isName(mozart::VM vm) { return _self.access().isName(vm); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } inline -class mozart::GlobalNode * TypedRichNode::globalize(VM vm) { +mozart::GlobalNode * TypedRichNode::globalize(mozart::VM vm) { return _self.access().globalize(_self, vm); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/Numeric-interf.hh b/vm/boostenv/main/cached/Numeric-interf.hh index bc54a5970..7ca56dc3a 100644 --- a/vm/boostenv/main/cached/Numeric-interf.hh +++ b/vm/boostenv/main/cached/Numeric-interf.hh @@ -4,7 +4,7 @@ public: Numeric(UnstableNode& self) : _self(self) {} Numeric(StableNode& self) : _self(self) {} - bool isNumber(VM vm) { + bool isNumber(mozart::VM vm) { if (_self.is()) { return _self.as().isNumber(vm); } else if (_self.is()) { @@ -24,7 +24,7 @@ public: } } - bool isInt(VM vm) { + bool isInt(mozart::VM vm) { if (_self.is()) { return _self.as().isInt(vm); } else if (_self.is()) { @@ -44,7 +44,7 @@ public: } } - bool isFloat(VM vm) { + bool isFloat(mozart::VM vm) { if (_self.is()) { return _self.as().isFloat(vm); } else if (_self.is()) { @@ -64,7 +64,7 @@ public: } } - class mozart::UnstableNode opposite(VM vm) { + mozart::UnstableNode opposite(mozart::VM vm) { if (_self.is()) { return _self.as().opposite(vm); } else if (_self.is()) { @@ -76,7 +76,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::Numeric::opposite", "opposite", ::mozart::ozcalls::out(_result))) return _result; } @@ -84,7 +84,7 @@ public: } } - class mozart::UnstableNode add(VM vm, class mozart::RichNode right) { + mozart::UnstableNode add(mozart::VM vm, mozart::RichNode right) { if (_self.is()) { return _self.as().add(vm, right); } else if (_self.is()) { @@ -96,7 +96,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::Numeric::add", "add", right, ::mozart::ozcalls::out(_result))) return _result; } @@ -104,7 +104,7 @@ public: } } - class mozart::UnstableNode add(VM vm, nativeint right) { + mozart::UnstableNode add(mozart::VM vm, mozart::nativeint right) { if (_self.is()) { return _self.as().add(vm, right); } else if (_self.is()) { @@ -116,7 +116,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::Numeric::add", "add", right, ::mozart::ozcalls::out(_result))) return _result; } @@ -124,7 +124,7 @@ public: } } - class mozart::UnstableNode subtract(VM vm, class mozart::RichNode right) { + mozart::UnstableNode subtract(mozart::VM vm, mozart::RichNode right) { if (_self.is()) { return _self.as().subtract(vm, right); } else if (_self.is()) { @@ -136,7 +136,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::Numeric::subtract", "subtract", right, ::mozart::ozcalls::out(_result))) return _result; } @@ -144,7 +144,7 @@ public: } } - class mozart::UnstableNode multiply(VM vm, class mozart::RichNode right) { + mozart::UnstableNode multiply(mozart::VM vm, mozart::RichNode right) { if (_self.is()) { return _self.as().multiply(vm, right); } else if (_self.is()) { @@ -156,7 +156,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::Numeric::multiply", "multiply", right, ::mozart::ozcalls::out(_result))) return _result; } @@ -164,7 +164,7 @@ public: } } - class mozart::UnstableNode div(VM vm, class mozart::RichNode right) { + mozart::UnstableNode div(mozart::VM vm, mozart::RichNode right) { if (_self.is()) { return _self.as().div(vm, right); } else if (_self.is()) { @@ -176,7 +176,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::Numeric::div", "div", right, ::mozart::ozcalls::out(_result))) return _result; } @@ -184,7 +184,7 @@ public: } } - class mozart::UnstableNode mod(VM vm, class mozart::RichNode right) { + mozart::UnstableNode mod(mozart::VM vm, mozart::RichNode right) { if (_self.is()) { return _self.as().mod(vm, right); } else if (_self.is()) { @@ -196,7 +196,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::Numeric::mod", "mod", right, ::mozart::ozcalls::out(_result))) return _result; } @@ -204,7 +204,7 @@ public: } } - class mozart::UnstableNode abs(VM vm) { + mozart::UnstableNode abs(mozart::VM vm) { if (_self.is()) { return _self.as().abs(vm); } else if (_self.is()) { @@ -216,7 +216,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::Numeric::abs", "abs", ::mozart::ozcalls::out(_result))) return _result; } diff --git a/vm/boostenv/main/cached/Object-implem-decl-after.hh b/vm/boostenv/main/cached/Object-implem-decl-after.hh index 7fa0a65e0..d21398dc1 100644 --- a/vm/boostenv/main/cached/Object-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Object-implem-decl-after.hh @@ -45,59 +45,59 @@ public: size_t getArraySize(); inline - StaticArray getElementsArray(); + StaticArray getElementsArray(); inline - class mozart::UnstableNode& getElements(size_t i); + mozart::UnstableNode& getElements(size_t i); inline - class mozart::Space * home(); + mozart::Space * home(); inline size_t getArraySizeImpl(); inline - class mozart::StableNode * getFeaturesRecord(); + mozart::StableNode * getFeaturesRecord(); inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline - bool isChunk(VM vm); + bool isChunk(mozart::VM vm); inline - bool isObject(VM vm); + bool isObject(mozart::VM vm); inline - class mozart::UnstableNode getClass(VM vm); + mozart::UnstableNode getClass(mozart::VM vm); inline - class mozart::UnstableNode attrGet(VM vm, class mozart::RichNode attribute); + mozart::UnstableNode attrGet(mozart::VM vm, mozart::RichNode attribute); inline - void attrPut(VM vm, class mozart::RichNode attribute, class mozart::RichNode value); + void attrPut(mozart::VM vm, mozart::RichNode attribute, mozart::RichNode value); inline - class mozart::UnstableNode attrExchange(VM vm, class mozart::RichNode attribute, class mozart::RichNode newValue); + mozart::UnstableNode attrExchange(mozart::VM vm, mozart::RichNode attribute, mozart::RichNode newValue); inline - bool isCallable(VM vm); + bool isCallable(mozart::VM vm); inline - bool isProcedure(VM vm); + bool isProcedure(mozart::VM vm); inline - size_t procedureArity(VM vm); + size_t procedureArity(mozart::VM vm); inline - void getCallInfo(VM vm, size_t & arity, ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks); + void getCallInfo(mozart::VM vm, size_t & arity, mozart::ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks); inline - void getDebugInfo(VM vm, atom_t & printName, class mozart::UnstableNode & debugData); + void getDebugInfo(mozart::VM vm, mozart::atom_t & printName, mozart::UnstableNode & debugData); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/Object-implem-decl.hh b/vm/boostenv/main/cached/Object-implem-decl.hh index fb6aa23b2..003b6dded 100644 --- a/vm/boostenv/main/cached/Object-implem-decl.hh +++ b/vm/boostenv/main/cached/Object-implem-decl.hh @@ -3,5 +3,5 @@ class Object; template <> class Storage { public: - typedef ImplWithArray Type; + typedef ImplWithArray Type; }; diff --git a/vm/boostenv/main/cached/Object-implem.hh b/vm/boostenv/main/cached/Object-implem.hh index 9ea9fd70a..b64af5029 100644 --- a/vm/boostenv/main/cached/Object-implem.hh +++ b/vm/boostenv/main/cached/Object-implem.hh @@ -37,16 +37,16 @@ size_t TypedRichNode::getArraySize() { return _self.access().getArraySize(); } -StaticArray TypedRichNode::getElementsArray() { +StaticArray TypedRichNode::getElementsArray() { return _self.access().getElementsArray(); } -class mozart::UnstableNode& TypedRichNode::getElements(size_t i) { +mozart::UnstableNode& TypedRichNode::getElements(size_t i) { return _self.access().getElements(i); } inline -class mozart::Space * TypedRichNode::home() { +mozart::Space * TypedRichNode::home() { return _self.access().home(); } @@ -56,76 +56,76 @@ size_t TypedRichNode::getArraySizeImpl() { } inline -class mozart::StableNode * TypedRichNode::getFeaturesRecord() { +mozart::StableNode * TypedRichNode::getFeaturesRecord() { return _self.access().getFeaturesRecord(); } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::isChunk(VM vm) { +bool TypedRichNode::isChunk(mozart::VM vm) { return _self.access().isChunk(vm); } inline -bool TypedRichNode::isObject(VM vm) { +bool TypedRichNode::isObject(mozart::VM vm) { return _self.access().isObject(vm); } inline -class mozart::UnstableNode TypedRichNode::getClass(VM vm) { +mozart::UnstableNode TypedRichNode::getClass(mozart::VM vm) { return _self.access().getClass(vm); } inline -class mozart::UnstableNode TypedRichNode::attrGet(VM vm, class mozart::RichNode attribute) { +mozart::UnstableNode TypedRichNode::attrGet(mozart::VM vm, mozart::RichNode attribute) { return _self.access().attrGet(_self, vm, attribute); } inline -void TypedRichNode::attrPut(VM vm, class mozart::RichNode attribute, class mozart::RichNode value) { +void TypedRichNode::attrPut(mozart::VM vm, mozart::RichNode attribute, mozart::RichNode value) { _self.access().attrPut(_self, vm, attribute, value); } inline -class mozart::UnstableNode TypedRichNode::attrExchange(VM vm, class mozart::RichNode attribute, class mozart::RichNode newValue) { +mozart::UnstableNode TypedRichNode::attrExchange(mozart::VM vm, mozart::RichNode attribute, mozart::RichNode newValue) { return _self.access().attrExchange(_self, vm, attribute, newValue); } inline -bool TypedRichNode::isCallable(VM vm) { +bool TypedRichNode::isCallable(mozart::VM vm) { return _self.access().isCallable(vm); } inline -bool TypedRichNode::isProcedure(VM vm) { +bool TypedRichNode::isProcedure(mozart::VM vm) { return _self.access().isProcedure(vm); } inline -size_t TypedRichNode::procedureArity(VM vm) { +size_t TypedRichNode::procedureArity(mozart::VM vm) { return _self.access().procedureArity(_self, vm); } inline -void TypedRichNode::getCallInfo(VM vm, size_t & arity, ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks) { +void TypedRichNode::getCallInfo(mozart::VM vm, size_t & arity, mozart::ProgramCounter & start, size_t & Xcount, StaticArray & Gs, StaticArray & Ks) { _self.access().getCallInfo(_self, vm, arity, start, Xcount, Gs, Ks); } inline -void TypedRichNode::getDebugInfo(VM vm, atom_t & printName, class mozart::UnstableNode & debugData) { +void TypedRichNode::getDebugInfo(mozart::VM vm, mozart::atom_t & printName, mozart::UnstableNode & debugData) { _self.access().getDebugInfo(vm, printName, debugData); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/ObjectLike-interf.hh b/vm/boostenv/main/cached/ObjectLike-interf.hh index c51e26493..974a9ce94 100644 --- a/vm/boostenv/main/cached/ObjectLike-interf.hh +++ b/vm/boostenv/main/cached/ObjectLike-interf.hh @@ -4,7 +4,7 @@ public: ObjectLike(UnstableNode& self) : _self(self) {} ObjectLike(StableNode& self) : _self(self) {} - bool isObject(VM vm) { + bool isObject(mozart::VM vm) { if (_self.is()) { return _self.as().isObject(vm); } else if (_self.isTransient()) { @@ -20,7 +20,7 @@ public: } } - class mozart::UnstableNode getClass(VM vm) { + mozart::UnstableNode getClass(mozart::VM vm) { if (_self.is()) { return _self.as().getClass(vm); } else if (_self.isTransient()) { @@ -28,7 +28,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::ObjectLike::getClass", "getClass", ::mozart::ozcalls::out(_result))) return _result; } @@ -36,7 +36,7 @@ public: } } - class mozart::UnstableNode attrGet(VM vm, class mozart::RichNode attribute) { + mozart::UnstableNode attrGet(mozart::VM vm, mozart::RichNode attribute) { if (_self.is()) { return _self.as().attrGet(vm, attribute); } else if (_self.isTransient()) { @@ -44,7 +44,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::ObjectLike::attrGet", "attrGet", attribute, ::mozart::ozcalls::out(_result))) return _result; } @@ -52,7 +52,7 @@ public: } } - void attrPut(VM vm, class mozart::RichNode attribute, class mozart::RichNode value) { + void attrPut(mozart::VM vm, mozart::RichNode attribute, mozart::RichNode value) { if (_self.is()) { return _self.as().attrPut(vm, attribute, value); } else if (_self.isTransient()) { @@ -67,7 +67,7 @@ public: } } - class mozart::UnstableNode attrExchange(VM vm, class mozart::RichNode attribute, class mozart::RichNode newValue) { + mozart::UnstableNode attrExchange(mozart::VM vm, mozart::RichNode attribute, mozart::RichNode newValue) { if (_self.is()) { return _self.as().attrExchange(vm, attribute, newValue); } else if (_self.isTransient()) { @@ -75,7 +75,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::ObjectLike::attrExchange", "attrExchange", attribute, newValue, ::mozart::ozcalls::out(_result))) return _result; } diff --git a/vm/boostenv/main/cached/OptName-implem-decl-after.hh b/vm/boostenv/main/cached/OptName-implem-decl-after.hh index 8cf97a211..d569f3ebd 100644 --- a/vm/boostenv/main/cached/OptName-implem-decl-after.hh +++ b/vm/boostenv/main/cached/OptName-implem-decl-after.hh @@ -45,56 +45,56 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::Space * home(); + mozart::Space * home(); inline - bool isLiteral(VM vm); + bool isLiteral(mozart::VM vm); inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline - bool isRecord(VM vm); + bool isRecord(mozart::VM vm); inline - bool isTuple(VM vm); + bool isTuple(mozart::VM vm); inline - class mozart::UnstableNode label(VM vm); + mozart::UnstableNode label(mozart::VM vm); inline - size_t width(VM vm); + size_t width(mozart::VM vm); inline - class mozart::UnstableNode arityList(VM vm); + mozart::UnstableNode arityList(mozart::VM vm); inline - class mozart::UnstableNode clone(VM vm); + mozart::UnstableNode clone(mozart::VM vm); inline - class mozart::UnstableNode waitOr(VM vm); + mozart::UnstableNode waitOr(mozart::VM vm); inline - bool testRecord(VM vm, class mozart::RichNode arity); + bool testRecord(mozart::VM vm, mozart::RichNode arity); inline - bool testTuple(VM vm, class mozart::RichNode label, size_t width); + bool testTuple(mozart::VM vm, mozart::RichNode label, size_t width); inline - bool testLabel(VM vm, class mozart::RichNode label); + bool testLabel(mozart::VM vm, mozart::RichNode label); inline - void makeFeature(VM vm); + void makeFeature(mozart::VM vm); inline - bool isName(VM vm); + bool isName(mozart::VM vm); inline - class mozart::GlobalNode * globalize(VM vm); + mozart::GlobalNode * globalize(mozart::VM vm); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/OptName-implem-decl.hh b/vm/boostenv/main/cached/OptName-implem-decl.hh index 0ed0d4ab0..2aad0d9f7 100644 --- a/vm/boostenv/main/cached/OptName-implem-decl.hh +++ b/vm/boostenv/main/cached/OptName-implem-decl.hh @@ -3,5 +3,5 @@ class OptName; template <> class Storage { public: - typedef struct mozart::SpaceRef Type; + typedef mozart::SpaceRef Type; }; diff --git a/vm/boostenv/main/cached/OptName-implem.hh b/vm/boostenv/main/cached/OptName-implem.hh index f13f5537c..09f2264ff 100644 --- a/vm/boostenv/main/cached/OptName-implem.hh +++ b/vm/boostenv/main/cached/OptName-implem.hh @@ -39,91 +39,91 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) const { } inline -class mozart::Space * TypedRichNode::home() { +mozart::Space * TypedRichNode::home() { return _self.access().home(); } inline -bool TypedRichNode::isLiteral(VM vm) { +bool TypedRichNode::isLiteral(mozart::VM vm) { return _self.access().isLiteral(vm); } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::isRecord(VM vm) { +bool TypedRichNode::isRecord(mozart::VM vm) { return _self.access().isRecord(vm); } inline -bool TypedRichNode::isTuple(VM vm) { +bool TypedRichNode::isTuple(mozart::VM vm) { return _self.access().isTuple(vm); } inline -class mozart::UnstableNode TypedRichNode::label(VM vm) { +mozart::UnstableNode TypedRichNode::label(mozart::VM vm) { return _self.access().label(_self, vm); } inline -size_t TypedRichNode::width(VM vm) { +size_t TypedRichNode::width(mozart::VM vm) { return _self.access().width(vm); } inline -class mozart::UnstableNode TypedRichNode::arityList(VM vm) { +mozart::UnstableNode TypedRichNode::arityList(mozart::VM vm) { return _self.access().arityList(vm); } inline -class mozart::UnstableNode TypedRichNode::clone(VM vm) { +mozart::UnstableNode TypedRichNode::clone(mozart::VM vm) { return _self.access().clone(_self, vm); } inline -class mozart::UnstableNode TypedRichNode::waitOr(VM vm) { +mozart::UnstableNode TypedRichNode::waitOr(mozart::VM vm) { return _self.access().waitOr(vm); } inline -bool TypedRichNode::testRecord(VM vm, class mozart::RichNode arity) { +bool TypedRichNode::testRecord(mozart::VM vm, mozart::RichNode arity) { return _self.access().testRecord(vm, arity); } inline -bool TypedRichNode::testTuple(VM vm, class mozart::RichNode label, size_t width) { +bool TypedRichNode::testTuple(mozart::VM vm, mozart::RichNode label, size_t width) { return _self.access().testTuple(_self, vm, label, width); } inline -bool TypedRichNode::testLabel(VM vm, class mozart::RichNode label) { +bool TypedRichNode::testLabel(mozart::VM vm, mozart::RichNode label) { return _self.access().testLabel(_self, vm, label); } inline -void TypedRichNode::makeFeature(VM vm) { +void TypedRichNode::makeFeature(mozart::VM vm) { _self.access().makeFeature(_self, vm); } inline -bool TypedRichNode::isName(VM vm) { +bool TypedRichNode::isName(mozart::VM vm) { return _self.access().isName(vm); } inline -class mozart::GlobalNode * TypedRichNode::globalize(VM vm) { +mozart::GlobalNode * TypedRichNode::globalize(mozart::VM vm) { return _self.access().globalize(_self, vm); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/OptVar-implem-decl-after.hh b/vm/boostenv/main/cached/OptVar-implem-decl-after.hh index 008159bef..736bc8bdf 100644 --- a/vm/boostenv/main/cached/OptVar-implem-decl-after.hh +++ b/vm/boostenv/main/cached/OptVar-implem-decl-after.hh @@ -38,23 +38,23 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::Space * home(); + mozart::Space * home(); inline - void addToSuspendList(VM vm, class mozart::RichNode variable); + void addToSuspendList(mozart::VM vm, mozart::RichNode variable); inline - bool isNeeded(VM vm); + bool isNeeded(mozart::VM vm); inline - void markNeeded(VM vm); + void markNeeded(mozart::VM vm); inline - void bind(VM vm, class mozart::UnstableNode && src); + void bind(mozart::VM vm, mozart::UnstableNode && src); inline - void bind(VM vm, class mozart::RichNode src); + void bind(mozart::VM vm, mozart::RichNode src); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/OptVar-implem-decl.hh b/vm/boostenv/main/cached/OptVar-implem-decl.hh index 8c2b657fd..0317b422f 100644 --- a/vm/boostenv/main/cached/OptVar-implem-decl.hh +++ b/vm/boostenv/main/cached/OptVar-implem-decl.hh @@ -3,5 +3,5 @@ class OptVar; template <> class Storage { public: - typedef struct mozart::SpaceRef Type; + typedef mozart::SpaceRef Type; }; diff --git a/vm/boostenv/main/cached/OptVar-implem.hh b/vm/boostenv/main/cached/OptVar-implem.hh index 50226a95e..263a43939 100644 --- a/vm/boostenv/main/cached/OptVar-implem.hh +++ b/vm/boostenv/main/cached/OptVar-implem.hh @@ -34,36 +34,36 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) const { } inline -class mozart::Space * TypedRichNode::home() { +mozart::Space * TypedRichNode::home() { return _self.access().home(); } inline -void TypedRichNode::addToSuspendList(VM vm, class mozart::RichNode variable) { +void TypedRichNode::addToSuspendList(mozart::VM vm, mozart::RichNode variable) { _self.access().addToSuspendList(_self, vm, variable); } inline -bool TypedRichNode::isNeeded(VM vm) { +bool TypedRichNode::isNeeded(mozart::VM vm) { return _self.access().isNeeded(vm); } inline -void TypedRichNode::markNeeded(VM vm) { +void TypedRichNode::markNeeded(mozart::VM vm) { _self.access().markNeeded(_self, vm); } inline -void TypedRichNode::bind(VM vm, class mozart::UnstableNode && src) { +void TypedRichNode::bind(mozart::VM vm, mozart::UnstableNode && src) { _self.access().bind(_self, vm, src); } inline -void TypedRichNode::bind(VM vm, class mozart::RichNode src) { +void TypedRichNode::bind(mozart::VM vm, mozart::RichNode src) { _self.access().bind(_self, vm, src); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/PatMatCapture-implem-decl-after.hh b/vm/boostenv/main/cached/PatMatCapture-implem-decl-after.hh index 321e88774..79d0613ec 100644 --- a/vm/boostenv/main/cached/PatMatCapture-implem-decl-after.hh +++ b/vm/boostenv/main/cached/PatMatCapture-implem-decl-after.hh @@ -5,7 +5,7 @@ class TypeInfoOf: public TypeInfo { return UUID(); } public: - TypeInfoOf() : TypeInfo("PatMatCapture", uuid(), (! ::mozart::MemWord::requiresExternalMemory()), false, false, sbValue, 0) {} + TypeInfoOf() : TypeInfo("PatMatCapture", uuid(), (! ::mozart::MemWord::requiresExternalMemory()), false, false, sbValue, 0) {} static const TypeInfoOf* const instance() { return &RawType::rawType; @@ -41,14 +41,14 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - nativeint index(); + mozart::nativeint index(); inline - bool equals(VM vm, class mozart::RichNode right); + bool equals(mozart::VM vm, mozart::RichNode right); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); }; diff --git a/vm/boostenv/main/cached/PatMatCapture-implem-decl.hh b/vm/boostenv/main/cached/PatMatCapture-implem-decl.hh index f3090965b..6eae9b615 100644 --- a/vm/boostenv/main/cached/PatMatCapture-implem-decl.hh +++ b/vm/boostenv/main/cached/PatMatCapture-implem-decl.hh @@ -3,5 +3,5 @@ class PatMatCapture; template <> class Storage { public: - typedef nativeint Type; + typedef mozart::nativeint Type; }; diff --git a/vm/boostenv/main/cached/PatMatCapture-implem.hh b/vm/boostenv/main/cached/PatMatCapture-implem.hh index d42c86d86..a95caf2a6 100644 --- a/vm/boostenv/main/cached/PatMatCapture-implem.hh +++ b/vm/boostenv/main/cached/PatMatCapture-implem.hh @@ -31,21 +31,21 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) c } inline -nativeint TypedRichNode::index() { +mozart::nativeint TypedRichNode::index() { return _self.access().index(); } inline -bool TypedRichNode::equals(VM vm, class mozart::RichNode right) { +bool TypedRichNode::equals(mozart::VM vm, mozart::RichNode right) { return _self.access().equals(vm, right); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } diff --git a/vm/boostenv/main/cached/PatMatConjunction-implem-decl-after.hh b/vm/boostenv/main/cached/PatMatConjunction-implem-decl-after.hh index e89baac01..36b79ca31 100644 --- a/vm/boostenv/main/cached/PatMatConjunction-implem-decl-after.hh +++ b/vm/boostenv/main/cached/PatMatConjunction-implem-decl-after.hh @@ -44,10 +44,10 @@ public: size_t getArraySize(); inline - StaticArray getElementsArray(); + StaticArray getElementsArray(); inline - class mozart::StableNode& getElements(size_t i); + mozart::StableNode& getElements(size_t i); inline size_t getArraySizeImpl(); @@ -56,14 +56,14 @@ public: size_t getCount(); inline - class mozart::StableNode * getElement(size_t index); + mozart::StableNode * getElement(size_t index); inline - bool equals(VM vm, class mozart::RichNode right, class mozart::WalkStack & stack); + bool equals(mozart::VM vm, mozart::RichNode right, mozart::WalkStack & stack); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); }; diff --git a/vm/boostenv/main/cached/PatMatConjunction-implem-decl.hh b/vm/boostenv/main/cached/PatMatConjunction-implem-decl.hh index 8fa48dec6..7b85b228f 100644 --- a/vm/boostenv/main/cached/PatMatConjunction-implem-decl.hh +++ b/vm/boostenv/main/cached/PatMatConjunction-implem-decl.hh @@ -3,5 +3,5 @@ class PatMatConjunction; template <> class Storage { public: - typedef ImplWithArray Type; + typedef ImplWithArray Type; }; diff --git a/vm/boostenv/main/cached/PatMatConjunction-implem.hh b/vm/boostenv/main/cached/PatMatConjunction-implem.hh index 598418b75..74e009a67 100644 --- a/vm/boostenv/main/cached/PatMatConjunction-implem.hh +++ b/vm/boostenv/main/cached/PatMatConjunction-implem.hh @@ -34,11 +34,11 @@ size_t TypedRichNode::getArraySize() { return _self.access().getArraySize(); } -StaticArray TypedRichNode::getElementsArray() { +StaticArray TypedRichNode::getElementsArray() { return _self.access().getElementsArray(); } -class mozart::StableNode& TypedRichNode::getElements(size_t i) { +mozart::StableNode& TypedRichNode::getElements(size_t i) { return _self.access().getElements(i); } @@ -53,21 +53,21 @@ size_t TypedRichNode::getCount() { } inline -class mozart::StableNode * TypedRichNode::getElement(size_t index) { +mozart::StableNode * TypedRichNode::getElement(size_t index) { return _self.access().getElement(index); } inline -bool TypedRichNode::equals(VM vm, class mozart::RichNode right, class mozart::WalkStack & stack) { +bool TypedRichNode::equals(mozart::VM vm, mozart::RichNode right, mozart::WalkStack & stack) { return _self.access().equals(vm, right, stack); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } diff --git a/vm/boostenv/main/cached/PatMatOpenRecord-implem-decl-after.hh b/vm/boostenv/main/cached/PatMatOpenRecord-implem-decl-after.hh index 5337cd28b..da7dfed9a 100644 --- a/vm/boostenv/main/cached/PatMatOpenRecord-implem-decl-after.hh +++ b/vm/boostenv/main/cached/PatMatOpenRecord-implem-decl-after.hh @@ -44,23 +44,23 @@ public: size_t getArraySize(); inline - StaticArray getElementsArray(); + StaticArray getElementsArray(); inline - class mozart::StableNode& getElements(size_t i); + mozart::StableNode& getElements(size_t i); inline size_t getArraySizeImpl(); inline - class mozart::StableNode * getElement(size_t index); + mozart::StableNode * getElement(size_t index); inline - class mozart::StableNode * getArity(); + mozart::StableNode * getArity(); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); }; diff --git a/vm/boostenv/main/cached/PatMatOpenRecord-implem-decl.hh b/vm/boostenv/main/cached/PatMatOpenRecord-implem-decl.hh index c16fdab30..27af0c35f 100644 --- a/vm/boostenv/main/cached/PatMatOpenRecord-implem-decl.hh +++ b/vm/boostenv/main/cached/PatMatOpenRecord-implem-decl.hh @@ -3,5 +3,5 @@ class PatMatOpenRecord; template <> class Storage { public: - typedef ImplWithArray Type; + typedef ImplWithArray Type; }; diff --git a/vm/boostenv/main/cached/PatMatOpenRecord-implem.hh b/vm/boostenv/main/cached/PatMatOpenRecord-implem.hh index cd155e426..835b802f8 100644 --- a/vm/boostenv/main/cached/PatMatOpenRecord-implem.hh +++ b/vm/boostenv/main/cached/PatMatOpenRecord-implem.hh @@ -34,11 +34,11 @@ size_t TypedRichNode::getArraySize() { return _self.access().getArraySize(); } -StaticArray TypedRichNode::getElementsArray() { +StaticArray TypedRichNode::getElementsArray() { return _self.access().getElementsArray(); } -class mozart::StableNode& TypedRichNode::getElements(size_t i) { +mozart::StableNode& TypedRichNode::getElements(size_t i) { return _self.access().getElements(i); } @@ -48,21 +48,21 @@ size_t TypedRichNode::getArraySizeImpl() { } inline -class mozart::StableNode * TypedRichNode::getElement(size_t index) { +mozart::StableNode * TypedRichNode::getElement(size_t index) { return _self.access().getElement(index); } inline -class mozart::StableNode * TypedRichNode::getArity() { +mozart::StableNode * TypedRichNode::getArity() { return _self.access().getArity(); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } diff --git a/vm/boostenv/main/cached/Port-implem-decl-after.hh b/vm/boostenv/main/cached/Port-implem-decl-after.hh index d277a737f..3fe77f3ae 100644 --- a/vm/boostenv/main/cached/Port-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Port-implem-decl-after.hh @@ -42,17 +42,17 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::Space * home(); + mozart::Space * home(); inline - bool isPort(VM vm); + bool isPort(mozart::VM vm); inline - void send(VM vm, class mozart::RichNode value); + void send(mozart::VM vm, mozart::RichNode value); inline - class mozart::UnstableNode sendReceive(VM vm, class mozart::RichNode value); + mozart::UnstableNode sendReceive(mozart::VM vm, mozart::RichNode value); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/Port-implem.hh b/vm/boostenv/main/cached/Port-implem.hh index 66fededf2..2822dd614 100644 --- a/vm/boostenv/main/cached/Port-implem.hh +++ b/vm/boostenv/main/cached/Port-implem.hh @@ -34,26 +34,26 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) const { } inline -class mozart::Space * TypedRichNode::home() { +mozart::Space * TypedRichNode::home() { return _self.access().home(); } inline -bool TypedRichNode::isPort(VM vm) { +bool TypedRichNode::isPort(mozart::VM vm) { return _self.access().isPort(vm); } inline -void TypedRichNode::send(VM vm, class mozart::RichNode value) { +void TypedRichNode::send(mozart::VM vm, mozart::RichNode value) { _self.access().send(vm, value); } inline -class mozart::UnstableNode TypedRichNode::sendReceive(VM vm, class mozart::RichNode value) { +mozart::UnstableNode TypedRichNode::sendReceive(mozart::VM vm, mozart::RichNode value) { return _self.access().sendReceive(vm, value); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/PortLike-interf.hh b/vm/boostenv/main/cached/PortLike-interf.hh index b001e3d26..bc8313344 100644 --- a/vm/boostenv/main/cached/PortLike-interf.hh +++ b/vm/boostenv/main/cached/PortLike-interf.hh @@ -4,7 +4,7 @@ public: PortLike(UnstableNode& self) : _self(self) {} PortLike(StableNode& self) : _self(self) {} - bool isPort(VM vm) { + bool isPort(mozart::VM vm) { if (_self.is()) { return _self.as().isPort(vm); } else if (_self.is()) { @@ -22,7 +22,7 @@ public: } } - void send(VM vm, class mozart::RichNode value) { + void send(mozart::VM vm, mozart::RichNode value) { if (_self.is()) { return _self.as().send(vm, value); } else if (_self.is()) { @@ -39,7 +39,7 @@ public: } } - class mozart::UnstableNode sendReceive(VM vm, class mozart::RichNode value) { + mozart::UnstableNode sendReceive(mozart::VM vm, mozart::RichNode value) { if (_self.is()) { return _self.as().sendReceive(vm, value); } else if (_self.is()) { @@ -49,7 +49,7 @@ public: throw std::exception(); // not reachable } else { if (_self.is< ::mozart::ReflectiveEntity>()) { - class mozart::UnstableNode _result; + mozart::UnstableNode _result; if (_self.as< ::mozart::ReflectiveEntity>().reflectiveCall(vm, "$intf$::PortLike::sendReceive", "sendReceive", value, ::mozart::ozcalls::out(_result))) return _result; } diff --git a/vm/boostenv/main/cached/PotentialFeature-interf.hh b/vm/boostenv/main/cached/PotentialFeature-interf.hh index 206771623..3d8bf1f64 100644 --- a/vm/boostenv/main/cached/PotentialFeature-interf.hh +++ b/vm/boostenv/main/cached/PotentialFeature-interf.hh @@ -4,7 +4,7 @@ public: PotentialFeature(UnstableNode& self) : _self(self) {} PotentialFeature(StableNode& self) : _self(self) {} - void makeFeature(VM vm) { + void makeFeature(mozart::VM vm) { if (_self.is()) { return _self.as().makeFeature(vm); } else if (_self.isTransient()) { diff --git a/vm/boostenv/main/cached/ReadOnly-implem-decl-after.hh b/vm/boostenv/main/cached/ReadOnly-implem-decl-after.hh index 8f23c5529..a4af6999f 100644 --- a/vm/boostenv/main/cached/ReadOnly-implem-decl-after.hh +++ b/vm/boostenv/main/cached/ReadOnly-implem-decl-after.hh @@ -38,26 +38,26 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::StableNode * getUnderlying(); + mozart::StableNode * getUnderlying(); inline - void wakeUp(VM vm); + void wakeUp(mozart::VM vm); inline - bool shouldWakeUpUnderSpace(VM vm, class mozart::Space * space); + bool shouldWakeUpUnderSpace(mozart::VM vm, mozart::Space * space); inline - void addToSuspendList(VM vm, class mozart::RichNode variable); + void addToSuspendList(mozart::VM vm, mozart::RichNode variable); inline - bool isNeeded(VM vm); + bool isNeeded(mozart::VM vm); inline - void markNeeded(VM vm); + void markNeeded(mozart::VM vm); inline - void bind(VM vm, class mozart::RichNode src); + void bind(mozart::VM vm, mozart::RichNode src); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/ReadOnly-implem-decl.hh b/vm/boostenv/main/cached/ReadOnly-implem-decl.hh index b654dcbb4..33d9f29de 100644 --- a/vm/boostenv/main/cached/ReadOnly-implem-decl.hh +++ b/vm/boostenv/main/cached/ReadOnly-implem-decl.hh @@ -3,5 +3,5 @@ class ReadOnly; template <> class Storage { public: - typedef class mozart::StableNode * Type; + typedef mozart::StableNode * Type; }; diff --git a/vm/boostenv/main/cached/ReadOnly-implem.hh b/vm/boostenv/main/cached/ReadOnly-implem.hh index ab24fdc54..ea2bd3858 100644 --- a/vm/boostenv/main/cached/ReadOnly-implem.hh +++ b/vm/boostenv/main/cached/ReadOnly-implem.hh @@ -12,9 +12,7 @@ void TypeInfoOf::gCollect(GC gc, RichNode from, StableNode& to) const void TypeInfoOf::gCollect(GC gc, RichNode from, UnstableNode& to) const { assert(from.type() == type()); - StableNode* stable = new (gc->vm) StableNode; - to.make(gc->vm, stable); - stable->make(gc->vm, gc, from.access()); + to.make(gc->vm, gc, from.access()); } void TypeInfoOf::sClone(SC sc, RichNode from, StableNode& to) const { @@ -28,41 +26,41 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) const } inline -class mozart::StableNode * TypedRichNode::getUnderlying() { +mozart::StableNode * TypedRichNode::getUnderlying() { return _self.access().getUnderlying(); } inline -void TypedRichNode::wakeUp(VM vm) { +void TypedRichNode::wakeUp(mozart::VM vm) { _self.access().wakeUp(_self, vm); } inline -bool TypedRichNode::shouldWakeUpUnderSpace(VM vm, class mozart::Space * space) { +bool TypedRichNode::shouldWakeUpUnderSpace(mozart::VM vm, mozart::Space * space) { return _self.access().shouldWakeUpUnderSpace(vm, space); } inline -void TypedRichNode::addToSuspendList(VM vm, class mozart::RichNode variable) { +void TypedRichNode::addToSuspendList(mozart::VM vm, mozart::RichNode variable) { _self.access().addToSuspendList(vm, variable); } inline -bool TypedRichNode::isNeeded(VM vm) { +bool TypedRichNode::isNeeded(mozart::VM vm) { return _self.access().isNeeded(vm); } inline -void TypedRichNode::markNeeded(VM vm) { +void TypedRichNode::markNeeded(mozart::VM vm) { _self.access().markNeeded(vm); } inline -void TypedRichNode::bind(VM vm, class mozart::RichNode src) { +void TypedRichNode::bind(mozart::VM vm, mozart::RichNode src) { _self.access().bind(vm, src); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/ReadOnlyVariable-implem-decl-after.hh b/vm/boostenv/main/cached/ReadOnlyVariable-implem-decl-after.hh index 3dba028a5..4d228f087 100644 --- a/vm/boostenv/main/cached/ReadOnlyVariable-implem-decl-after.hh +++ b/vm/boostenv/main/cached/ReadOnlyVariable-implem-decl-after.hh @@ -38,23 +38,23 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::Space * home(); + mozart::Space * home(); inline - void addToSuspendList(VM vm, class mozart::RichNode variable); + void addToSuspendList(mozart::VM vm, mozart::RichNode variable); inline - bool isNeeded(VM vm); + bool isNeeded(mozart::VM vm); inline - void markNeeded(VM vm); + void markNeeded(mozart::VM vm); inline - void bind(VM vm, class mozart::RichNode src); + void bind(mozart::VM vm, mozart::RichNode src); inline - void bindReadOnly(VM vm, class mozart::RichNode src); + void bindReadOnly(mozart::VM vm, mozart::RichNode src); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/ReadOnlyVariable-implem.hh b/vm/boostenv/main/cached/ReadOnlyVariable-implem.hh index 72f5c8661..26d5f8243 100644 --- a/vm/boostenv/main/cached/ReadOnlyVariable-implem.hh +++ b/vm/boostenv/main/cached/ReadOnlyVariable-implem.hh @@ -26,36 +26,36 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to } inline -class mozart::Space * TypedRichNode::home() { +mozart::Space * TypedRichNode::home() { return _self.access().home(); } inline -void TypedRichNode::addToSuspendList(VM vm, class mozart::RichNode variable) { +void TypedRichNode::addToSuspendList(mozart::VM vm, mozart::RichNode variable) { _self.access().addToSuspendList(vm, variable); } inline -bool TypedRichNode::isNeeded(VM vm) { +bool TypedRichNode::isNeeded(mozart::VM vm) { return _self.access().isNeeded(vm); } inline -void TypedRichNode::markNeeded(VM vm) { +void TypedRichNode::markNeeded(mozart::VM vm) { _self.access().markNeeded(vm); } inline -void TypedRichNode::bind(VM vm, class mozart::RichNode src) { +void TypedRichNode::bind(mozart::VM vm, mozart::RichNode src) { _self.access().bind(_self, vm, src); } inline -void TypedRichNode::bindReadOnly(VM vm, class mozart::RichNode src) { +void TypedRichNode::bindReadOnly(mozart::VM vm, mozart::RichNode src) { _self.access().bindReadOnly(_self, vm, src); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } diff --git a/vm/boostenv/main/cached/Record-implem-decl-after.hh b/vm/boostenv/main/cached/Record-implem-decl-after.hh index ed2dcb8d3..01cf0a381 100644 --- a/vm/boostenv/main/cached/Record-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Record-implem-decl-after.hh @@ -48,10 +48,10 @@ public: size_t getArraySize(); inline - StaticArray getElementsArray(); + StaticArray getElementsArray(); inline - class mozart::StableNode& getElements(size_t i); + mozart::StableNode& getElements(size_t i); inline size_t getArraySizeImpl(); @@ -60,53 +60,53 @@ public: size_t getWidth(); inline - class mozart::StableNode * getElement(size_t index); + mozart::StableNode * getElement(size_t index); inline - bool isRecord(VM vm); + bool isRecord(mozart::VM vm); inline - size_t width(VM vm); + size_t width(mozart::VM vm); inline - class mozart::UnstableNode arityList(VM vm); + mozart::UnstableNode arityList(mozart::VM vm); inline - class mozart::UnstableNode waitOr(VM vm); + mozart::UnstableNode waitOr(mozart::VM vm); inline - class mozart::StableNode * getArity(); + mozart::StableNode * getArity(); inline - bool equals(VM vm, class mozart::RichNode right, class mozart::WalkStack & stack); + bool equals(mozart::VM vm, mozart::RichNode right, mozart::WalkStack & stack); inline - bool lookupFeature(VM vm, class mozart::RichNode feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value); inline - bool lookupFeature(VM vm, nativeint feature, nullable value); + bool lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value); inline - bool isTuple(VM vm); + bool isTuple(mozart::VM vm); inline - class mozart::UnstableNode label(VM vm); + mozart::UnstableNode label(mozart::VM vm); inline - class mozart::UnstableNode clone(VM vm); + mozart::UnstableNode clone(mozart::VM vm); inline - bool testRecord(VM vm, class mozart::RichNode arity); + bool testRecord(mozart::VM vm, mozart::RichNode arity); inline - bool testTuple(VM vm, class mozart::RichNode label, size_t width); + bool testTuple(mozart::VM vm, mozart::RichNode label, size_t width); inline - bool testLabel(VM vm, class mozart::RichNode label); + bool testLabel(mozart::VM vm, mozart::RichNode label); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); inline - class mozart::UnstableNode serialize(VM vm, SE se); + mozart::UnstableNode serialize(mozart::VM vm, mozart::SE se); }; diff --git a/vm/boostenv/main/cached/Record-implem-decl.hh b/vm/boostenv/main/cached/Record-implem-decl.hh index 65117e3ae..2718b2de7 100644 --- a/vm/boostenv/main/cached/Record-implem-decl.hh +++ b/vm/boostenv/main/cached/Record-implem-decl.hh @@ -3,5 +3,5 @@ class Record; template <> class Storage { public: - typedef ImplWithArray Type; + typedef ImplWithArray Type; }; diff --git a/vm/boostenv/main/cached/Record-implem.hh b/vm/boostenv/main/cached/Record-implem.hh index 0c9ea6f2c..3b7085b1c 100644 --- a/vm/boostenv/main/cached/Record-implem.hh +++ b/vm/boostenv/main/cached/Record-implem.hh @@ -34,11 +34,11 @@ size_t TypedRichNode::getArraySize() { return _self.access().getArraySize(); } -StaticArray TypedRichNode::getElementsArray() { +StaticArray TypedRichNode::getElementsArray() { return _self.access().getElementsArray(); } -class mozart::StableNode& TypedRichNode::getElements(size_t i) { +mozart::StableNode& TypedRichNode::getElements(size_t i) { return _self.access().getElements(i); } @@ -53,86 +53,86 @@ size_t TypedRichNode::getWidth() { } inline -class mozart::StableNode * TypedRichNode::getElement(size_t index) { +mozart::StableNode * TypedRichNode::getElement(size_t index) { return _self.access().getElement(index); } inline -bool TypedRichNode::isRecord(VM vm) { +bool TypedRichNode::isRecord(mozart::VM vm) { return _self.access().isRecord(vm); } inline -size_t TypedRichNode::width(VM vm) { +size_t TypedRichNode::width(mozart::VM vm) { return _self.access().width(vm); } inline -class mozart::UnstableNode TypedRichNode::arityList(VM vm) { +mozart::UnstableNode TypedRichNode::arityList(mozart::VM vm) { return _self.access().arityList(vm); } inline -class mozart::UnstableNode TypedRichNode::waitOr(VM vm) { +mozart::UnstableNode TypedRichNode::waitOr(mozart::VM vm) { return _self.access().waitOr(vm); } inline -class mozart::StableNode * TypedRichNode::getArity() { +mozart::StableNode * TypedRichNode::getArity() { return _self.access().getArity(); } inline -bool TypedRichNode::equals(VM vm, class mozart::RichNode right, class mozart::WalkStack & stack) { +bool TypedRichNode::equals(mozart::VM vm, mozart::RichNode right, mozart::WalkStack & stack) { return _self.access().equals(vm, right, stack); } inline -bool TypedRichNode::lookupFeature(VM vm, class mozart::RichNode feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::RichNode feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::lookupFeature(VM vm, nativeint feature, nullable value) { +bool TypedRichNode::lookupFeature(mozart::VM vm, mozart::nativeint feature, nullable value) { return _self.access().lookupFeature(vm, feature, value); } inline -bool TypedRichNode::isTuple(VM vm) { +bool TypedRichNode::isTuple(mozart::VM vm) { return _self.access().isTuple(vm); } inline -class mozart::UnstableNode TypedRichNode::label(VM vm) { +mozart::UnstableNode TypedRichNode::label(mozart::VM vm) { return _self.access().label(vm); } inline -class mozart::UnstableNode TypedRichNode::clone(VM vm) { +mozart::UnstableNode TypedRichNode::clone(mozart::VM vm) { return _self.access().clone(vm); } inline -bool TypedRichNode::testRecord(VM vm, class mozart::RichNode arity) { +bool TypedRichNode::testRecord(mozart::VM vm, mozart::RichNode arity) { return _self.access().testRecord(vm, arity); } inline -bool TypedRichNode::testTuple(VM vm, class mozart::RichNode label, size_t width) { +bool TypedRichNode::testTuple(mozart::VM vm, mozart::RichNode label, size_t width) { return _self.access().testTuple(vm, label, width); } inline -bool TypedRichNode::testLabel(VM vm, class mozart::RichNode label) { +bool TypedRichNode::testLabel(mozart::VM vm, mozart::RichNode label) { return _self.access().testLabel(vm, label); } inline -void TypedRichNode::printReprToStream(VM vm, std::ostream & out, int depth, int width) { +void TypedRichNode::printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width) { _self.access().printReprToStream(vm, out, depth, width); } inline -class mozart::UnstableNode TypedRichNode::serialize(VM vm, SE se) { +mozart::UnstableNode TypedRichNode::serialize(mozart::VM vm, mozart::SE se) { return _self.access().serialize(vm, se); } diff --git a/vm/boostenv/main/cached/RecordLike-interf.hh b/vm/boostenv/main/cached/RecordLike-interf.hh index 68d4313a9..7ea645c25 100644 --- a/vm/boostenv/main/cached/RecordLike-interf.hh +++ b/vm/boostenv/main/cached/RecordLike-interf.hh @@ -4,7 +4,7 @@ public: RecordLike(UnstableNode& self) : _self(self) {} RecordLike(StableNode& self) : _self(self) {} - bool isRecord(VM vm) { + bool isRecord(mozart::VM vm) { if (_self.is()) { return _self.as().isRecord(vm); } else if (_self.is()) { @@ -29,7 +29,7 @@ public: } } - bool isTuple(VM vm) { + bool isTuple(mozart::VM vm) { if (_self.is()) { return _self.as().isTuple(vm); } else if (_self.is()) { @@ -54,7 +54,7 @@ public: } } - class mozart::UnstableNode label(VM vm) { + mozart::UnstableNode label(mozart::VM vm) { if (_self.is()) { return _self.as().label(vm); } else if (_self.is()) { @@ -79,7 +79,7 @@ public: } } - size_t width(VM vm) { + size_t width(mozart::VM vm) { if (_self.is()) { return _self.as().width(vm); } else if (_self.is()) { @@ -104,7 +104,7 @@ public: } } - class mozart::UnstableNode arityList(VM vm) { + mozart::UnstableNode arityList(mozart::VM vm) { if (_self.is()) { return _self.as().arityList(vm); } else if (_self.is()) { @@ -129,7 +129,7 @@ public: } } - class mozart::UnstableNode clone(VM vm) { + mozart::UnstableNode clone(mozart::VM vm) { if (_self.is()) { return _self.as().clone(vm); } else if (_self.is()) { @@ -154,7 +154,7 @@ public: } } - class mozart::UnstableNode waitOr(VM vm) { + mozart::UnstableNode waitOr(mozart::VM vm) { if (_self.is()) { return _self.as().waitOr(vm); } else if (_self.is()) { @@ -179,7 +179,7 @@ public: } } - bool testRecord(VM vm, class mozart::RichNode arity) { + bool testRecord(mozart::VM vm, mozart::RichNode arity) { if (_self.is()) { return _self.as().testRecord(vm, arity); } else if (_self.is()) { @@ -204,7 +204,7 @@ public: } } - bool testTuple(VM vm, class mozart::RichNode label, size_t width) { + bool testTuple(mozart::VM vm, mozart::RichNode label, size_t width) { if (_self.is()) { return _self.as().testTuple(vm, label, width); } else if (_self.is()) { @@ -229,7 +229,7 @@ public: } } - bool testLabel(VM vm, class mozart::RichNode label) { + bool testLabel(mozart::VM vm, mozart::RichNode label) { if (_self.is()) { return _self.as().testLabel(vm, label); } else if (_self.is()) { diff --git a/vm/boostenv/main/cached/Reference-implem-decl-after.hh b/vm/boostenv/main/cached/Reference-implem-decl-after.hh index 4afce2e5f..f0d962547 100644 --- a/vm/boostenv/main/cached/Reference-implem-decl-after.hh +++ b/vm/boostenv/main/cached/Reference-implem-decl-after.hh @@ -5,7 +5,7 @@ class TypeInfoOf: public TypeInfo { return UUID(); } public: - TypeInfoOf() : TypeInfo("Reference", uuid(), (! ::mozart::MemWord::requiresExternalMemory()), false, false, sbValue, 0) {} + TypeInfoOf() : TypeInfo("Reference", uuid(), (! ::mozart::MemWord::requiresExternalMemory()), false, false, sbValue, 0) {} static const TypeInfoOf* const instance() { return &RawType::rawType; @@ -34,5 +34,5 @@ public: explicit TypedRichNode(RichNode self) : BaseTypedRichNode(self) {} inline - class mozart::StableNode * dest(); + mozart::StableNode * dest(); }; diff --git a/vm/boostenv/main/cached/Reference-implem-decl.hh b/vm/boostenv/main/cached/Reference-implem-decl.hh index 65450d9e6..88e3946b5 100644 --- a/vm/boostenv/main/cached/Reference-implem-decl.hh +++ b/vm/boostenv/main/cached/Reference-implem-decl.hh @@ -3,5 +3,5 @@ class Reference; template <> class Storage { public: - typedef class mozart::StableNode * Type; + typedef mozart::StableNode * Type; }; diff --git a/vm/boostenv/main/cached/Reference-implem.hh b/vm/boostenv/main/cached/Reference-implem.hh index aee78981d..c75725374 100644 --- a/vm/boostenv/main/cached/Reference-implem.hh +++ b/vm/boostenv/main/cached/Reference-implem.hh @@ -6,9 +6,7 @@ void TypeInfoOf::gCollect(GC gc, RichNode from, StableNode& to) const void TypeInfoOf::gCollect(GC gc, RichNode from, UnstableNode& to) const { assert(from.type() == type()); - StableNode* stable = new (gc->vm) StableNode; - to.make(gc->vm, stable); - stable->make(gc->vm, gc, from.access()); + to.make(gc->vm, gc, from.access()); } void TypeInfoOf::sClone(SC sc, RichNode from, StableNode& to) const { @@ -18,12 +16,10 @@ void TypeInfoOf::sClone(SC sc, RichNode from, StableNode& to) const { void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to) const { assert(from.type() == type()); - StableNode* stable = new (sc->vm) StableNode; -to.make(sc->vm, stable); -stable->make(sc->vm, sc, from.access()); + to.make(sc->vm, sc, from.access()); } inline -class mozart::StableNode * TypedRichNode::dest() { +mozart::StableNode * TypedRichNode::dest() { return _self.access().dest(); } diff --git a/vm/boostenv/main/cached/ReflectiveEntity-implem-decl-after.hh b/vm/boostenv/main/cached/ReflectiveEntity-implem-decl-after.hh index 6277b9d03..716cf6862 100644 --- a/vm/boostenv/main/cached/ReflectiveEntity-implem-decl-after.hh +++ b/vm/boostenv/main/cached/ReflectiveEntity-implem-decl-after.hh @@ -43,8 +43,8 @@ public: template inline - bool reflectiveCall(VM vm, const char * identity, Label && label, Args &&... args); + bool reflectiveCall(mozart::VM vm, const char * identity, Label && label, Args &&... args); inline - void printReprToStream(VM vm, std::ostream & out, int depth, int width); + void printReprToStream(mozart::VM vm, std::ostream & out, int depth, int width); }; diff --git a/vm/boostenv/main/cached/ReflectiveEntity-implem.hh b/vm/boostenv/main/cached/ReflectiveEntity-implem.hh index a83b2dc04..4ea812666 100644 --- a/vm/boostenv/main/cached/ReflectiveEntity-implem.hh +++ b/vm/boostenv/main/cached/ReflectiveEntity-implem.hh @@ -27,11 +27,11 @@ void TypeInfoOf::sClone(SC sc, RichNode from, UnstableNode& to template inline -bool TypedRichNode::reflectiveCall(VM vm, const char * identity, Label && label, Args &&... args) { +bool TypedRichNode::reflectiveCall(mozart::VM vm, const char * identity, Label && label, Args &&... args) { return _self.access().reflectiveCall(vm, identity, std::forward