jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

AST refacroting: Green refactoring preparing for a more general visitor system: Made accept() a macro and use a common supertype BaseVisitable.

Browse source
This commit is contained in:
Marius Kintel 2016-05-08 22:15:57 -04:00
parent fb18ec935b
commit 7800683cf1
16 changed files with 38 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/BaseVisitable.h Normal file
View file

@ -0,0 +1,15 @@
#pragma once
#include "visitor.h"
class BaseVisitable
{
public:
virtual ~BaseVisitable() {}
virtual Response accept(class State&, Visitor&) const = 0;
};
#define VISITABLE() \
virtual Response accept(class State &state, Visitor &visitor) const { \
return visitor.visit(state, *this); \
}

4
src/cgaladvnode.h
View file

@ -16,13 +16,11 @@ enum cgaladv_type_e {
class CgaladvNode : public AbstractNode
{
public:
VISITABLE();
CgaladvNode(const ModuleInstantiation *mi, cgaladv_type_e type) : AbstractNode(mi), type(type) {
convexity = 1;
}
virtual ~CgaladvNode() { }
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const;

4
src/colornode.h
View file

@ -7,10 +7,8 @@
class ColorNode : public AbstractNode
{
public:
VISITABLE();
ColorNode(const ModuleInstantiation *mi) : AbstractNode(mi) { }
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const;

4
src/csgops.h
View file

@ -7,11 +7,9 @@
class CsgOpNode : public AbstractNode
{
public:
VISITABLE();
OpenSCADOperator type;
CsgOpNode(const ModuleInstantiation *mi, OpenSCADOperator type) : AbstractNode(mi), type(type) { }
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const;
};

4
src/importnode.h
View file

@ -14,10 +14,8 @@ enum import_type_e {
class ImportNode : public LeafNode
{
public:
VISITABLE();
ImportNode(const ModuleInstantiation *mi, import_type_e type) : LeafNode(mi), type(type) { }
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const;

4
src/linearextrudenode.h
View file

@ -7,6 +7,7 @@
class LinearExtrudeNode : public AbstractPolyNode
{
public:
VISITABLE();
LinearExtrudeNode(const ModuleInstantiation *mi) : AbstractPolyNode(mi) {
convexity = slices = 0;
fn = fs = fa = height = twist = 0;
@ -14,9 +15,6 @@ public:
scale_x = scale_y = 1;
center = has_twist = false;
}
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const { return "linear_extrude"; }

31
src/node.cc
View file

@ -47,37 +47,6 @@ AbstractNode::~AbstractNode()
std::for_each(this->children.begin(), this->children.end(), del_fun<AbstractNode>());
}
Response AbstractNode::accept(class State &state, Visitor &visitor) const
{
return visitor.visit(state, *this);
}
Response AbstractIntersectionNode::accept(class State &state, Visitor &visitor) const
{
return visitor.visit(state, *this);
}
Response AbstractPolyNode::accept(class State &state, Visitor &visitor) const
{
return visitor.visit(state, *this);
}
Response GroupNode::accept(class State &state, Visitor &visitor) const
{
return visitor.visit(state, *this);
}
Response RootNode::accept(class State &state, Visitor &visitor) const
{
return visitor.visit(state, *this);
}
Response LeafNode::accept(class State &state, Visitor &visitor) const
{
return visitor.visit(state, *this);
}
std::string AbstractNode::toString() const
{
return this->name() + "()";

19
src/node.h
View file

@ -2,13 +2,13 @@
#include <vector>
#include <string>
#include "traverser.h"
#include "BaseVisitable.h"
extern int progress_report_count;
extern void (*progress_report_f)(const class AbstractNode*, void*, int);
extern void *progress_report_vp;
void progress_report_prep(AbstractNode *root, void (*f)(const class AbstractNode *node, void *vp, int mark), void *vp);
void progress_report_prep(class AbstractNode *root, void (*f)(const class AbstractNode *node, void *vp, int mark), void *vp);
void progress_report_fin();
/*!
@ -18,7 +18,7 @@ void progress_report_fin();
scratch for each compile.
*/
class AbstractNode
class AbstractNode : public BaseVisitable
{
// FIXME: the idx_counter/idx is mostly (only?) for debugging.
// We can hash on pointer value or smth. else.
@ -26,9 +26,9 @@ class AbstractNode
// use smth. else to display node identifier in CSG tree output?
static size_t idx_counter; // Node instantiation index
public:
VISITABLE();
AbstractNode(const class ModuleInstantiation *mi);
virtual ~AbstractNode();
virtual Response accept(class State &state, class Visitor &visitor) const;
virtual std::string toString() const;
/*! The 'OpenSCAD name' of this node, defaults to classname, but can be
overloaded to provide specialization for e.g. CSG nodes, primitive nodes etc.
@ -58,9 +58,9 @@ public:
class AbstractIntersectionNode : public AbstractNode
{
public:
VISITABLE();
AbstractIntersectionNode(const ModuleInstantiation *mi) : AbstractNode(mi) { };
virtual ~AbstractIntersectionNode() { };
virtual Response accept(class State &state, class Visitor &visitor) const;
virtual std::string toString() const;
virtual std::string name() const;
};
@ -68,9 +68,9 @@ public:
class AbstractPolyNode : public AbstractNode
{
public:
VISITABLE();
AbstractPolyNode(const ModuleInstantiation *mi) : AbstractNode(mi) { };
virtual ~AbstractPolyNode() { };
virtual Response accept(class State &state, class Visitor &visitor) const;
enum render_mode_e {
RENDER_CGAL,
@ -85,9 +85,9 @@ public:
class GroupNode : public AbstractNode
{
public:
VISITABLE();
GroupNode(const class ModuleInstantiation *mi) : AbstractNode(mi) { }
virtual ~GroupNode() { }
virtual Response accept(class State &state, class Visitor &visitor) const;
virtual std::string name() const;
};
@ -97,18 +97,19 @@ public:
class RootNode : public GroupNode
{
public:
VISITABLE();
RootNode(const class ModuleInstantiation *mi) : GroupNode(mi) { }
virtual ~RootNode() { }
virtual Response accept(class State &state, class Visitor &visitor) const;
virtual std::string name() const;
};
class LeafNode : public AbstractPolyNode
{
public:
VISITABLE();
LeafNode(const ModuleInstantiation *mi) : AbstractPolyNode(mi) { };
virtual ~LeafNode() { };
virtual Response accept(class State &state, class Visitor &visitor) const;
virtual const class Geometry *createGeometry() const = 0;
};

4
src/offsetnode.h
View file

@ -8,10 +8,8 @@
class OffsetNode : public AbstractPolyNode
{
public:
VISITABLE();
OffsetNode(const ModuleInstantiation *mi) : AbstractPolyNode(mi), fn(0), fs(0), fa(0), delta(1), miter_limit(1000000.0), join_type(ClipperLib::jtRound) { }
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const { return "offset"; }

4
src/primitives.cc
View file

@ -65,10 +65,8 @@ private:
class PrimitiveNode : public LeafNode
{
public:
VISITABLE();
PrimitiveNode(const ModuleInstantiation *mi, primitive_type_e type) : LeafNode(mi), type(type) { }
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const {
switch (this->type) {

4
src/projectionnode.h
View file

@ -7,12 +7,10 @@
class ProjectionNode : public AbstractPolyNode
{
public:
VISITABLE();
ProjectionNode(const ModuleInstantiation *mi) : AbstractPolyNode(mi) {
cut_mode = false;
}
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const { return "projection"; }

4
src/rendernode.h
View file

@ -7,10 +7,8 @@
class RenderNode : public AbstractNode
{
public:
VISITABLE();
RenderNode(const ModuleInstantiation *mi) : AbstractNode(mi), convexity(1) { }
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const { return "render"; }

4
src/rotateextrudenode.h
View file

@ -7,15 +7,13 @@
class RotateExtrudeNode : public AbstractPolyNode
{
public:
VISITABLE();
RotateExtrudeNode(const ModuleInstantiation *mi) : AbstractPolyNode(mi) {
convexity = 0;
fn = fs = fa = 0;
origin_x = origin_y = scale = 0;
angle = 360;
}
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const { return "rotate_extrude"; }

4
src/surface.cc
View file

@ -61,10 +61,8 @@ typedef std::unordered_map<std::pair<int,int>, double, boost::hash<std::pair<int
class SurfaceNode : public LeafNode
{
public:
VISITABLE();
SurfaceNode(const ModuleInstantiation *mi) : LeafNode(mi) { }
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const { return "surface"; }

5
src/textnode.h
View file

@ -11,12 +11,9 @@ class TextModule;
class TextNode : public AbstractPolyNode
{
public:
VISITABLE();
TextNode(const ModuleInstantiation *mi) : AbstractPolyNode(mi) {}
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const { return "text"; }

4
src/transformnode.h
View file

@ -7,10 +7,8 @@
class TransformNode : public AbstractNode
{
public:
VISITABLE();
TransformNode(const ModuleInstantiation *mi) : AbstractNode(mi) { }
virtual Response accept(class State &state, Visitor &visitor) const {
return visitor.visit(state, *this);
}
virtual std::string toString() const;
virtual std::string name() const;