Skip to content

Commit bc2e696

Browse files
octreeoctree
committed
➕ Adding a dependency.
1 parent de721bd commit bc2e696

20 files changed

+68
-633
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Carthage
66
#
77
# Add this line if you want to avoid checking in source code from Carthage dependencies.
8-
# Carthage/Checkouts
8+
Carthage/Checkouts
99

1010
Carthage/Build
1111

‎Cartfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "Octree/ParserCombinator"

‎Cartfile.resolved

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github "Octree/FP" "0.2.0"
2+
github "Octree/ParserCombinator" "0.2.0"

‎MarkRight.xcodeproj/project.pbxproj

Lines changed: 50 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,9 @@
1717
C27C6EDE207EE2E100178A1F /* ContainerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = C27C6EDD207EE2E100178A1F /* ContainerNode.swift */; };
1818
C27C6EE0207EF17D00178A1F /* theme.css in Resources */ = {isa = PBXBuildFile; fileRef = C27C6EDF207EF17D00178A1F /* theme.css */; };
1919
C27C6EE3207EF41000178A1F /* css_injector.js in Resources */ = {isa = PBXBuildFile; fileRef = C27C6EE2207EF41000178A1F /* css_injector.js */; };
20-
C28245CB2081E6D1001E0561 /* Runes.swift in Sources */ = {isa = PBXBuildFile; fileRef = C28245C32081E6D0001E0561 /* Runes.swift */; };
21-
C28245CC2081E6D1001E0561 /* ParserRunes.swift in Sources */ = {isa = PBXBuildFile; fileRef = C28245C42081E6D0001E0561 /* ParserRunes.swift */; };
22-
C28245CD2081E6D1001E0561 /* SubstringParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C28245C52081E6D0001E0561 /* SubstringParser.swift */; };
23-
C28245CE2081E6D1001E0561 /* Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = C28245C62081E6D0001E0561 /* Parser.swift */; };
24-
C28245CF2081E6D1001E0561 /* ParserCombinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C28245C72081E6D0001E0561 /* ParserCombinator.swift */; };
25-
C28245D02081E6D1001E0561 /* ParserError.swift in Sources */ = {isa = PBXBuildFile; fileRef = C28245C82081E6D0001E0561 /* ParserError.swift */; };
26-
C28245D12081E6D1001E0561 /* Reply.swift in Sources */ = {isa = PBXBuildFile; fileRef = C28245C92081E6D0001E0561 /* Reply.swift */; };
27-
C28245D22081E6D1001E0561 /* Curry.swift in Sources */ = {isa = PBXBuildFile; fileRef = C28245CA2081E6D1001E0561 /* Curry.swift */; };
2820
C28245D420826EBE001E0561 /* theme-solarized-dark.css in Resources */ = {isa = PBXBuildFile; fileRef = C28245D320826EBE001E0561 /* theme-solarized-dark.css */; };
21+
C2A3E74E216070E9002DC267 /* FP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2A3E74C216070E9002DC267 /* FP.framework */; };
22+
C2A3E74F216070E9002DC267 /* ParserCombinator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2A3E74D216070E9002DC267 /* ParserCombinator.framework */; };
2923
C2B081D4207E7855005C47F4 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2B081D3207E7855005C47F4 /* AppDelegate.swift */; };
3024
C2B081D6207E7855005C47F4 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2B081D5207E7855005C47F4 /* ViewController.swift */; };
3125
C2B081D8207E7856005C47F4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C2B081D7207E7856005C47F4 /* Assets.xcassets */; };
@@ -68,15 +62,9 @@
6862
C27C6EDD207EE2E100178A1F /* ContainerNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerNode.swift; sourceTree = "<group>"; };
6963
C27C6EDF207EF17D00178A1F /* theme.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = theme.css; sourceTree = "<group>"; };
7064
C27C6EE2207EF41000178A1F /* css_injector.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = css_injector.js; sourceTree = "<group>"; };
71-
C28245C32081E6D0001E0561 /* Runes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Runes.swift; sourceTree = "<group>"; };
72-
C28245C42081E6D0001E0561 /* ParserRunes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParserRunes.swift; sourceTree = "<group>"; };
73-
C28245C52081E6D0001E0561 /* SubstringParser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubstringParser.swift; sourceTree = "<group>"; };
74-
C28245C62081E6D0001E0561 /* Parser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Parser.swift; sourceTree = "<group>"; };
75-
C28245C72081E6D0001E0561 /* ParserCombinator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParserCombinator.swift; sourceTree = "<group>"; };
76-
C28245C82081E6D0001E0561 /* ParserError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ParserError.swift; sourceTree = "<group>"; };
77-
C28245C92081E6D0001E0561 /* Reply.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Reply.swift; sourceTree = "<group>"; };
78-
C28245CA2081E6D1001E0561 /* Curry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Curry.swift; sourceTree = "<group>"; };
7965
C28245D320826EBE001E0561 /* theme-solarized-dark.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = "theme-solarized-dark.css"; sourceTree = "<group>"; };
66+
C2A3E74C216070E9002DC267 /* FP.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FP.framework; path = Carthage/Build/Mac/FP.framework; sourceTree = "<group>"; };
67+
C2A3E74D216070E9002DC267 /* ParserCombinator.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ParserCombinator.framework; path = Carthage/Build/Mac/ParserCombinator.framework; sourceTree = "<group>"; };
8068
C2B081D0207E7855005C47F4 /* MarkRight.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MarkRight.app; sourceTree = BUILT_PRODUCTS_DIR; };
8169
C2B081D3207E7855005C47F4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
8270
C2B081D5207E7855005C47F4 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -108,6 +96,8 @@
10896
isa = PBXFrameworksBuildPhase;
10997
buildActionMask = 2147483647;
11098
files = (
99+
C2A3E74E216070E9002DC267 /* FP.framework in Frameworks */,
100+
C2A3E74F216070E9002DC267 /* ParserCombinator.framework in Frameworks */,
111101
);
112102
runOnlyForDeploymentPostprocessing = 0;
113103
};
@@ -132,12 +122,22 @@
132122
path = Resource;
133123
sourceTree = "<group>";
134124
};
125+
C2A3E74B216070E9002DC267 /* Frameworks */ = {
126+
isa = PBXGroup;
127+
children = (
128+
C2A3E74C216070E9002DC267 /* FP.framework */,
129+
C2A3E74D216070E9002DC267 /* ParserCombinator.framework */,
130+
);
131+
name = Frameworks;
132+
sourceTree = "<group>";
133+
};
135134
C2B081C7207E7855005C47F4 = {
136135
isa = PBXGroup;
137136
children = (
138137
C2B081D2207E7855005C47F4 /* MarkRight */,
139138
C2B081E5207E7857005C47F4 /* MarkRightTests */,
140139
C2B081D1207E7855005C47F4 /* Products */,
140+
C2A3E74B216070E9002DC267 /* Frameworks */,
141141
);
142142
sourceTree = "<group>";
143143
};
@@ -227,14 +227,6 @@
227227
C2B081FF207E786C005C47F4 /* Parser */ = {
228228
isa = PBXGroup;
229229
children = (
230-
C28245CA2081E6D1001E0561 /* Curry.swift */,
231-
C28245C62081E6D0001E0561 /* Parser.swift */,
232-
C28245C72081E6D0001E0561 /* ParserCombinator.swift */,
233-
C28245C82081E6D0001E0561 /* ParserError.swift */,
234-
C28245C42081E6D0001E0561 /* ParserRunes.swift */,
235-
C28245C92081E6D0001E0561 /* Reply.swift */,
236-
C28245C32081E6D0001E0561 /* Runes.swift */,
237-
C28245C52081E6D0001E0561 /* SubstringParser.swift */,
238230
);
239231
path = Parser;
240232
sourceTree = "<group>";
@@ -260,6 +252,7 @@
260252
C2B081CC207E7855005C47F4 /* Sources */,
261253
C2B081CD207E7855005C47F4 /* Frameworks */,
262254
C2B081CE207E7855005C47F4 /* Resources */,
255+
C2A3E75121607454002DC267 /* ShellScript */,
263256
);
264257
buildRules = (
265258
);
@@ -303,6 +296,7 @@
303296
};
304297
C2B081E1207E7857005C47F4 = {
305298
CreatedOnToolsVersion = 9.3;
299+
LastSwiftMigration = 1000;
306300
TestTargetID = C2B081CF207E7855005C47F4;
307301
};
308302
};
@@ -349,19 +343,36 @@
349343
};
350344
/* End PBXResourcesBuildPhase section */
351345

346+
/* Begin PBXShellScriptBuildPhase section */
347+
C2A3E75121607454002DC267 /* ShellScript */ = {
348+
isa = PBXShellScriptBuildPhase;
349+
buildActionMask = 2147483647;
350+
files = (
351+
);
352+
inputFileListPaths = (
353+
);
354+
inputPaths = (
355+
"$(SRCROOT)/Carthage/Build/Mac/FP.framework",
356+
"$(SRCROOT)/Carthage/Build/Mac/ParserCombinator.framework",
357+
);
358+
outputFileListPaths = (
359+
);
360+
outputPaths = (
361+
);
362+
runOnlyForDeploymentPostprocessing = 0;
363+
shellPath = /bin/sh;
364+
shellScript = "/usr/local/bin/carthage copy-frameworks\n";
365+
};
366+
/* End PBXShellScriptBuildPhase section */
367+
352368
/* Begin PBXSourcesBuildPhase section */
353369
C2B081CC207E7855005C47F4 /* Sources */ = {
354370
isa = PBXSourcesBuildPhase;
355371
buildActionMask = 2147483647;
356372
files = (
357-
C28245CF2081E6D1001E0561 /* ParserCombinator.swift in Sources */,
358373
080D3448207F00F1002E28E4 /* BlockNode+HTML.swift in Sources */,
359-
C28245CC2081E6D1001E0561 /* ParserRunes.swift in Sources */,
360374
C2B0820A207E786C005C47F4 /* Inlines.swift in Sources */,
361375
C2D094FF207F8CB0002B033F /* Utilities.swift in Sources */,
362-
C28245CB2081E6D1001E0561 /* Runes.swift in Sources */,
363-
C28245D12081E6D1001E0561 /* Reply.swift in Sources */,
364-
C28245D22081E6D1001E0561 /* Curry.swift in Sources */,
365376
C27C6ED8207EE00000178A1F /* InlineNode.swift in Sources */,
366377
C2B08206207E786C005C47F4 /* ContainerItems.swift in Sources */,
367378
C2B0820E207E786C005C47F4 /* MarkdownNode+HTML.swift in Sources */,
@@ -380,10 +391,7 @@
380391
C27C6EDE207EE2E100178A1F /* ContainerNode.swift in Sources */,
381392
C2B08208207E786C005C47F4 /* ListItems.swift in Sources */,
382393
C2D09501207F8CB0002B033F /* String+HTMLEntities.swift in Sources */,
383-
C28245CE2081E6D1001E0561 /* Parser.swift in Sources */,
384394
C2B08209207E786C005C47F4 /* MarkdownParser.swift in Sources */,
385-
C28245CD2081E6D1001E0561 /* SubstringParser.swift in Sources */,
386-
C28245D02081E6D1001E0561 /* ParserError.swift in Sources */,
387395
C2D094FE207F8CB0002B033F /* Constants.swift in Sources */,
388396
);
389397
runOnlyForDeploymentPostprocessing = 0;
@@ -538,6 +546,10 @@
538546
CODE_SIGN_STYLE = Automatic;
539547
COMBINE_HIDPI_IMAGES = YES;
540548
DEVELOPMENT_TEAM = 7A5GV3DH33;
549+
FRAMEWORK_SEARCH_PATHS = (
550+
"$(inherited)",
551+
"$(PROJECT_DIR)/Carthage/Build/Mac",
552+
);
541553
INFOPLIST_FILE = MarkRight/Info.plist;
542554
LD_RUNPATH_SEARCH_PATHS = (
543555
"$(inherited)",
@@ -556,6 +568,10 @@
556568
CODE_SIGN_STYLE = Automatic;
557569
COMBINE_HIDPI_IMAGES = YES;
558570
DEVELOPMENT_TEAM = 7A5GV3DH33;
571+
FRAMEWORK_SEARCH_PATHS = (
572+
"$(inherited)",
573+
"$(PROJECT_DIR)/Carthage/Build/Mac",
574+
);
559575
INFOPLIST_FILE = MarkRight/Info.plist;
560576
LD_RUNPATH_SEARCH_PATHS = (
561577
"$(inherited)",
@@ -583,7 +599,7 @@
583599
);
584600
PRODUCT_BUNDLE_IDENTIFIER = me.octree.MarkRightTests;
585601
PRODUCT_NAME = "$(TARGET_NAME)";
586-
SWIFT_VERSION = 4.0;
602+
SWIFT_VERSION = 4.2;
587603
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MarkRight.app/Contents/MacOS/MarkRight";
588604
};
589605
name = Debug;
@@ -604,7 +620,7 @@
604620
);
605621
PRODUCT_BUNDLE_IDENTIFIER = me.octree.MarkRightTests;
606622
PRODUCT_NAME = "$(TARGET_NAME)";
607-
SWIFT_VERSION = 4.0;
623+
SWIFT_VERSION = 4.2;
608624
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MarkRight.app/Contents/MacOS/MarkRight";
609625
};
610626
name = Release;

‎MarkRight.xcodeproj/xcuserdata/octree.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dict>
55
<key>SchemeUserState</key>
66
<dict>
7-
<key>MarkRight.xcscheme</key>
7+
<key>MarkRight.xcscheme_^#shared#^_</key>
88
<dict>
99
<key>orderHint</key>
1010
<integer>0</integer>

‎MarkRight/MarkdownParser/ContainerItems.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
//
88

99
import Foundation
10+
import FP
11+
import ParserCombinator
1012

1113

1214
/*********************************************

‎MarkRight/MarkdownParser/GenericStringTerms.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
//
88

99
import Foundation
10-
10+
import FP
11+
import ParserCombinator
1112

1213
/*********************************************
1314
********** Generic String Terms ***********

‎MarkRight/MarkdownParser/Inlines.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
//
88

99
import Foundation
10-
10+
import FP
11+
import ParserCombinator
1112

1213
/*********************************************
1314
********** Inlines ***********

‎MarkRight/MarkdownParser/LeafBlock.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
//
88

99
import Foundation
10-
10+
import FP
11+
import ParserCombinator
1112

1213
/*********************************************
1314
********** Leaf Block Parser ***********

‎MarkRight/MarkdownParser/ListItems.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
//
88

99
import Foundation
10-
10+
import FP
11+
import ParserCombinator
1112

1213
/*********************************************
1314
********** List Items Parser ***********

‎MarkRight/MarkdownParser/MarkdownParser.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
//
88

99
import Foundation
10-
10+
import FP
11+
import ParserCombinator
1112

1213
/*********************************************
1314
********** Markdown Parser ***********

‎MarkRight/Parser/Curry.swift

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎MarkRight/Parser/Parser.swift

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)