Skip to content
This repository was archived by the owner on Nov 8, 2024. It is now read-only.

Commit a7dd4c5

Browse files
pksunkarapksunkara
committed
chore: Remove ast type option
1 parent c9dd51f commit a7dd4c5

File tree

183 files changed

+13237
-18119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+13237
-18119
lines changed

‎drafter.gyp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
"sources": [
4040
"src/drafter.h",
4141
"src/drafter.cc",
42-
"src/drafter_private.h",
43-
"src/drafter_private.cc",
4442
"src/stream.h",
4543
"src/Version.h",
4644

@@ -126,8 +124,6 @@
126124
],
127125
'sources': [
128126
"test/test-drafter.cc",
129-
"test/test-SerializeResultTest.cc",
130-
"test/test-SerializeSourceMapTest.cc",
131127
"test/test-RefractDataStructureTest.cc",
132128
"test/test-RefractAPITest.cc",
133129
"test/test-RefractParseResultTest.cc",

‎drafter.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@
7777
401074A31B833A1000B66442 /* Render.cc in Sources */ = {isa = PBXBuildFile; fileRef = 401074A21B833A1000B66442 /* Render.cc */; };
7878
401A61C11D65D28900B0CC17 /* ConversionContext.cc in Sources */ = {isa = PBXBuildFile; fileRef = 401A61C01D65D28900B0CC17 /* ConversionContext.cc */; };
7979
4038935E1CBFC1D400D01E17 /* ConversionContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4038935D1CBFC1D400D01E17 /* ConversionContext.h */; };
80-
403893641CC0007F00D01E17 /* test-SerializeSourceMapTest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 403893631CC0007F00D01E17 /* test-SerializeSourceMapTest.cc */; };
81-
403893661CC0021700D01E17 /* test-SerializeResultTest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 403893651CC0021700D01E17 /* test-SerializeResultTest.cc */; };
8280
4041F8D61DB66CEE005A4A40 /* test-SyntaxIssuesTest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4041F8D51DB66CEE005A4A40 /* test-SyntaxIssuesTest.cc */; };
8381
408560761CBB983100932414 /* test-ExtendElementTest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 40AEF8201CB80C4F000A0DEE /* test-ExtendElementTest.cc */; };
8482
4093675E1CBB90DE0065A78A /* test-ApplyVisitorTest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4093675C1CBB90DE0065A78A /* test-ApplyVisitorTest.cc */; };
@@ -204,8 +202,6 @@
204202
401074A21B833A1000B66442 /* Render.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Render.cc; path = src/Render.cc; sourceTree = SOURCE_ROOT; };
205203
401A61C01D65D28900B0CC17 /* ConversionContext.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ConversionContext.cc; path = src/ConversionContext.cc; sourceTree = SOURCE_ROOT; };
206204
4038935D1CBFC1D400D01E17 /* ConversionContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ConversionContext.h; path = src/ConversionContext.h; sourceTree = SOURCE_ROOT; };
207-
403893631CC0007F00D01E17 /* test-SerializeSourceMapTest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "test-SerializeSourceMapTest.cc"; path = "test/test-SerializeSourceMapTest.cc"; sourceTree = "<group>"; };
208-
403893651CC0021700D01E17 /* test-SerializeResultTest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "test-SerializeResultTest.cc"; path = "test/test-SerializeResultTest.cc"; sourceTree = "<group>"; };
209205
4041F8D51DB66CEE005A4A40 /* test-SyntaxIssuesTest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "test-SyntaxIssuesTest.cc"; path = "test/test-SyntaxIssuesTest.cc"; sourceTree = "<group>"; };
210206
4093675C1CBB90DE0065A78A /* test-ApplyVisitorTest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "test-ApplyVisitorTest.cc"; path = "test/test-ApplyVisitorTest.cc"; sourceTree = "<group>"; };
211207
4093675D1CBB90DE0065A78A /* test-ElementFactoryTest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "test-ElementFactoryTest.cc"; path = "test/test-ElementFactoryTest.cc"; sourceTree = "<group>"; };
@@ -297,8 +293,6 @@
297293
40DDBDD91BE14EE700B10819 /* test-RefractSourceMapTest.cc */,
298294
19A129CC1B70ADC300366AA7 /* test-RenderTest.cc */,
299295
400FFA0B1C1B0E12006A4CE0 /* test-SchemaTest.cc */,
300-
403893651CC0021700D01E17 /* test-SerializeResultTest.cc */,
301-
403893631CC0007F00D01E17 /* test-SerializeSourceMapTest.cc */,
302296
4041F8D51DB66CEE005A4A40 /* test-SyntaxIssuesTest.cc */,
303297
);
304298
name = "test-libdrafter";
@@ -602,15 +596,13 @@
602596
19A129E01B70AE3200366AA7 /* test-drafter.cc in Sources */,
603597
400F54051C598A35004EA235 /* test-CircularReferenceTest.cc in Sources */,
604598
40DDBDDA1BE14EE700B10819 /* test-RefractSourceMapTest.cc in Sources */,
605-
403893641CC0007F00D01E17 /* test-SerializeSourceMapTest.cc in Sources */,
606599
40E6DFA11CF494FE009B3FF3 /* test-OneOfTest.cc in Sources */,
607600
400FFA0C1C1B0E12006A4CE0 /* test-SchemaTest.cc in Sources */,
608601
19A129E21B70AE3200366AA7 /* test-RenderTest.cc in Sources */,
609602
4041F8D61DB66CEE005A4A40 /* test-SyntaxIssuesTest.cc in Sources */,
610603
40EF03DD1B72135E00865990 /* test-RefractAPITest.cc in Sources */,
611604
40AEEC3D1BB60CB6005866DD /* test-RefractParseResultTest.cc in Sources */,
612605
4093675E1CBB90DE0065A78A /* test-ApplyVisitorTest.cc in Sources */,
613-
403893661CC0021700D01E17 /* test-SerializeResultTest.cc in Sources */,
614606
);
615607
runOnlyForDeploymentPostprocessing = 0;
616608
};

‎src/Serialize.h‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ namespace snowcrash {
3131

3232
namespace drafter {
3333

34-
enum ASTType {
35-
NormalASTType = 0, // Normal AST
36-
RefractASTType, // Refract AST
37-
UnknownASTType = -1
38-
};
39-
4034
enum SerializeFormat {
4135
JSONFormat = 0, // JSON Format
4236
YAMLFormat, // YAML Format
@@ -45,18 +39,17 @@ namespace drafter {
4539

4640
// Options struct for drafter
4741
struct WrapperOptions {
48-
const ASTType astType;
4942
const bool generateSourceMap;
5043
const bool expandMSON;
5144

52-
WrapperOptions(const ASTType astType, const bool generateSourceMap, const bool expandMSON)
53-
: astType(astType), generateSourceMap(generateSourceMap), expandMSON(expandMSON) {}
45+
WrapperOptions(const bool generateSourceMap, const bool expandMSON)
46+
: generateSourceMap(generateSourceMap), expandMSON(expandMSON) {}
5447

55-
WrapperOptions(const ASTType astType, const bool generateSourceMap)
56-
: astType(astType), generateSourceMap(generateSourceMap), expandMSON(false) {}
48+
WrapperOptions(const bool generateSourceMap)
49+
: generateSourceMap(generateSourceMap), expandMSON(false) {}
5750

58-
WrapperOptions(const ASTType astType)
59-
: astType(astType), generateSourceMap(false), expandMSON(false) {}
51+
WrapperOptions()
52+
: generateSourceMap(false), expandMSON(false) {}
6053
};
6154

6255
/**

‎src/SerializeResult.cc‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,12 @@ sos::Object drafter::WrapResult(snowcrash::ParseResult<snowcrash::Blueprint>& bl
153153
{
154154
ConversionContext context(options);
155155

156-
if (options.astType == RefractASTType) {
157-
refract::IElement* parseResult = WrapParseResultRefract(blueprint, context);
156+
refract::IElement* parseResult = WrapParseResultRefract(blueprint, context);
157+
sos::Object result = SerializeRefract(parseResult, context);
158158

159-
sos::Object result = SerializeRefract(parseResult, context);
160-
161-
if (parseResult) {
162-
delete parseResult;
163-
}
164-
165-
return result;
166-
}
167-
else {
168-
return WrapParseResultAST(blueprint, context);
159+
if (parseResult) {
160+
delete parseResult;
169161
}
162+
163+
return result;
170164
}

‎src/config.cc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ namespace config {
1818

1919
static const std::string Output = "output";
2020
static const std::string Format = "format";
21-
static const std::string Type = "type";
22-
static const std::string Render = "render";
2321
static const std::string Sourcemap = "sourcemap";
2422
static const std::string Help = "help";
2523
static const std::string Validate = "validate";
@@ -33,7 +31,6 @@ void PrepareCommanLineParser(cmdline::parser& parser)
3331

3432
parser.add<std::string>(config::Output, 'o', "save output Parse Result into file", false);
3533
parser.add<std::string>(config::Format, 'f', "output format of the Parse Result (yaml|json)", false, "yaml", cmdline::oneof<std::string>("yaml", "json"));
36-
parser.add<std::string>(config::Type, 't', "type of the Parse Result (refract|ast)", false, "refract", cmdline::oneof<std::string>("refract", "ast"));
3734
parser.add(config::Sourcemap, 's', "export sourcemap in the Parse Result");
3835
parser.add(config::Help, 'h', "display this help message");
3936
parser.add(config::Version , 'v', "print Drafter version");
@@ -83,7 +80,6 @@ void ParseCommadLineOptions(int argc, const char *argv[], /* out */Config& conf)
8380
conf.lineNumbers = parser.exist(config::UseLineNumbers);
8481
conf.validate = parser.exist(config::Validate);
8582
conf.format = parser.get<std::string>(config::Format) == "json" ? drafter::JSONFormat : drafter::YAMLFormat;
86-
conf.astType = parser.get<std::string>(config::Type) == "ast" ? drafter::NormalASTType : drafter::RefractASTType;
8783
conf.output = parser.get<std::string>(config::Output);
8884
conf.sourceMap = parser.exist(config::Sourcemap);
8985

‎src/config.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ struct Config {
1818
bool lineNumbers;
1919
bool validate;
2020
drafter::SerializeFormat format;
21-
drafter::ASTType astType;
2221
bool sourceMap;
2322
std::string output;
2423
};

‎src/drafter.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ DRAFTER_API int drafter_parse_blueprint(const char* source,
7575
sc::ParseResult<sc::Blueprint> blueprint;
7676
sc::parse(source, scOptions, blueprint);
7777

78-
drafter::WrapperOptions wrapperOptions(drafter::RefractASTType);
78+
drafter::WrapperOptions wrapperOptions;
7979
drafter::ConversionContext context(wrapperOptions);
8080
refract::IElement* result = WrapParseResultRefract(blueprint, context);
8181

@@ -116,8 +116,8 @@ DRAFTER_API char* drafter_serialize(drafter_result *res, const drafter_options o
116116
return nullptr;
117117
}
118118

119-
drafter::WrapperOptions woptions(drafter::RefractASTType, options.sourcemap);
120-
drafter::ConversionContext context(woptions);
119+
drafter::WrapperOptions wrapperOptions(options.sourcemap);
120+
drafter::ConversionContext context(wrapperOptions);
121121

122122
sos::Object result = drafter::SerializeRefract(res, context);
123123

‎src/main.cc‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -51,35 +51,6 @@ void Serialization(std::ostream *stream,
5151
*stream << std::flush;
5252
}
5353

54-
int ProcessAST(const Config& config, std::unique_ptr<std::istream>& in, std::unique_ptr<std::ostream>& out)
55-
{
56-
std::stringstream inputStream;
57-
inputStream << in->rdbuf();
58-
59-
sc::ParseResult<sc::Blueprint> blueprint;
60-
sc::parse(inputStream.str(), snowcrash::ExportSourcemapOption, blueprint);
61-
62-
std::unique_ptr<sos::Serialize> serializer(CreateSerializer(config.format));
63-
64-
try {
65-
sos::Object resultObject = drafter::WrapResult(blueprint, drafter::WrapperOptions(config.astType, config.sourceMap));
66-
67-
if (!config.validate) { // If not validate, we serialize
68-
Serialization(out.get(), resultObject, serializer.get());
69-
}
70-
}
71-
catch (snowcrash::Error& e) {
72-
blueprint.report.error = e;
73-
}
74-
catch (std::exception& e) {
75-
blueprint.report.error = snowcrash::Error(e.what(), snowcrash::ApplicationError);
76-
}
77-
78-
PrintReport(blueprint.report, inputStream.str(), config.lineNumbers);
79-
80-
return blueprint.report.error.code;
81-
}
82-
8354
int ProcessRefract(const Config& config, std::unique_ptr<std::istream>& in, std::unique_ptr<std::ostream>& out)
8455
{
8556
std::stringstream inputStream;
@@ -129,12 +100,5 @@ int main(int argc, const char *argv[])
129100
std::unique_ptr<std::istream> in(CreateStreamFromName<std::istream>(config.input));
130101
std::unique_ptr<std::ostream> out(CreateStreamFromName<std::ostream>(config.output));
131102

132-
if (config.astType == drafter::RefractASTType) {
133-
return ProcessRefract(config, in, out);
134-
}
135-
else if (config.astType == drafter::NormalASTType) {
136-
return ProcessAST(config, in, out);
137-
}
138-
139-
103+
return ProcessRefract(config, in, out);
140104
}

‎test/draftertest.h‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,28 +21,18 @@
2121
}
2222

2323
#define TEST_REFRACT(category, name) TEST_CASE("Testing refract serialization for " category " " name, "[refract][" category "][" name "]") { \
24-
FixtureHelper::handleResultJSON(&drafter::WrapResult, "test/fixtures/" category "/" name, drafter::WrapperOptions(drafter::RefractASTType)); \
24+
FixtureHelper::handleResultJSON(&drafter::WrapResult, "test/fixtures/" category "/" name, drafter::WrapperOptions(false)); \
2525
}
2626

2727
#define TEST_REFRACT_SOURCE_MAP(category, name) TEST_CASE("Testing refract + source map serialization for " category " " name, "[refract_sourcemap][" category "][" name "]") { \
28-
FixtureHelper::handleResultJSON(&drafter::WrapResult, "test/fixtures/" category "/" name, drafter::WrapperOptions(drafter::RefractASTType, true)); \
29-
}
30-
31-
#define TEST_AST(category, name) TEST_CASE("Testing AST serialization for " category " " name, "[ast][" category "][" name "]") { \
32-
FixtureHelper::handleResultJSON(&drafter::WrapResult, "test/fixtures/" category "/" name, drafter::WrapperOptions(drafter::NormalASTType)); \
33-
}
34-
35-
#define TEST_AST_SOURCE_MAP(category, name) TEST_CASE("Testing AST + source map serialization for " category " " name, "[ast_sourcemap][" category "][" name "]") { \
36-
FixtureHelper::handleResultJSON(&drafter::WrapResult, "test/fixtures/" category "/" name, drafter::WrapperOptions(drafter::NormalASTType, true)); \
28+
FixtureHelper::handleResultJSON(&drafter::WrapResult, "test/fixtures/" category "/" name, drafter::WrapperOptions(true)); \
3729
}
3830

3931
namespace draftertest {
4032
namespace ext {
4133
const std::string apib = ".apib";
4234
const std::string json = ".json";
4335
const std::string sourceMapJson = ".sourcemap.json";
44-
const std::string astJson = ".ast.json";
45-
const std::string astSourceMapJson = ".ast.sourcemap.json";
4636
}
4737

4838
class ITFixtureFiles {
@@ -122,18 +112,10 @@ namespace draftertest {
122112

123113
static std::string getFixtureExtension(const drafter::WrapperOptions& options) {
124114

125-
if (options.astType == drafter::RefractASTType) {
126-
if (options.generateSourceMap) {
115+
if (options.generateSourceMap) {
127116
return ext::sourceMapJson;
128-
} else {
129-
return ext::json;
130-
}
131117
} else {
132-
if (options.generateSourceMap) {
133-
return ext::astSourceMapJson;
134-
} else {
135-
return ext::astJson;
136-
}
118+
return ext::json;
137119
}
138120

139121
return ext::json;

0 commit comments

Comments
 (0)