Skip to content

Commit

Permalink
Extract expression parsing to GRMustacheExpressionParser
Browse files Browse the repository at this point in the history
  • Loading branch information
@groue
groue committed Jun 4, 2013
1 parent 4a9d7a6 commit dcaa98a
Show file tree
Hide file tree
Showing 8 changed files with 678 additions and 631 deletions.
28 changes: 20 additions & 8 deletions src/GRMustache.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
563D66EA1526497E008628C5 /* GRMustacheSuitesTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 563D66E81526497E008628C5 /* GRMustacheSuitesTest.m */; };
563D66EF152649DF008628C5 /* GRMustacheContextPrivateTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 563D66EC152649DF008628C5 /* GRMustacheContextPrivateTest.m */; };
563D66F0152649DF008628C5 /* GRMustacheContextPrivateTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 563D66EC152649DF008628C5 /* GRMustacheContextPrivateTest.m */; };
563D66F1152649DF008628C5 /* GRMustacheParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 563D66EE152649DF008628C5 /* GRMustacheParserTest.m */; };
563D66F2152649DF008628C5 /* GRMustacheParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 563D66EE152649DF008628C5 /* GRMustacheParserTest.m */; };
563D66F1152649DF008628C5 /* GRMustacheExpressionParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 563D66EE152649DF008628C5 /* GRMustacheExpressionParserTest.m */; };
563D66F2152649DF008628C5 /* GRMustacheExpressionParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 563D66EE152649DF008628C5 /* GRMustacheExpressionParserTest.m */; };
563D66F415264B40008628C5 /* GRMustacheSuites in Resources */ = {isa = PBXBuildFile; fileRef = 563D66F315264B40008628C5 /* GRMustacheSuites */; };
563D66F515264B40008628C5 /* GRMustacheSuites in Resources */ = {isa = PBXBuildFile; fileRef = 563D66F315264B40008628C5 /* GRMustacheSuites */; };
563D671F15264EDA008628C5 /* JRSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = 563D670115264EDA008628C5 /* JRSwizzle.h */; };
Expand Down Expand Up @@ -139,6 +139,10 @@
5682B4C01528DF4A00ADD123 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5682B4BF1528DF4900ADD123 /* Foundation.framework */; };
5682B4C31528E0B300ADD123 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5682B4BF1528DF4900ADD123 /* Foundation.framework */; };
5682B4C51528E0C600ADD123 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5682B4C41528E0C500ADD123 /* CoreData.framework */; };
568ECC32175DB0D000F1178F /* GRMustacheExpressionParser_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 568ECC30175DB0CC00F1178F /* GRMustacheExpressionParser_private.h */; };
568ECC33175DB0D000F1178F /* GRMustacheExpressionParser_private.h in Headers */ = {isa = PBXBuildFile; fileRef = 568ECC30175DB0CC00F1178F /* GRMustacheExpressionParser_private.h */; };
568ECC34175DB0D000F1178F /* GRMustacheExpressionParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 568ECC31175DB0CD00F1178F /* GRMustacheExpressionParser.m */; };
568ECC35175DB0D000F1178F /* GRMustacheExpressionParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 568ECC31175DB0CD00F1178F /* GRMustacheExpressionParser.m */; };
56907EE615FC752F0081BC2A /* GRMustacheExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 56907EE515FC752E0081BC2A /* GRMustacheExpression.m */; };
56907EE715FC752F0081BC2A /* GRMustacheExpression.m in Sources */ = {isa = PBXBuildFile; fileRef = 56907EE515FC752E0081BC2A /* GRMustacheExpression.m */; };
56907F191604B5C50081BC2A /* GRMustacheFilterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 56907F161604B5C50081BC2A /* GRMustacheFilterTest.m */; };
Expand Down Expand Up @@ -315,7 +319,7 @@
ABAF866916A0A65A001ADE96 /* GRSpecificationSuitesTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 56DEC3BF152639560031E8DC /* GRSpecificationSuitesTest.m */; };
ABAF866B16A0A65A001ADE96 /* GRMustacheSuitesTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 563D66E81526497E008628C5 /* GRMustacheSuitesTest.m */; };
ABAF866C16A0A65A001ADE96 /* GRMustacheContextPrivateTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 563D66EC152649DF008628C5 /* GRMustacheContextPrivateTest.m */; };
ABAF866D16A0A65A001ADE96 /* GRMustacheParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 563D66EE152649DF008628C5 /* GRMustacheParserTest.m */; };
ABAF866D16A0A65A001ADE96 /* GRMustacheExpressionParserTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 563D66EE152649DF008628C5 /* GRMustacheExpressionParserTest.m */; };
ABAF866E16A0A65A001ADE96 /* GRBooleanTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 560CE88E1526EEF4004F935E /* GRBooleanTest.m */; };
ABAF866F16A0A65A001ADE96 /* GRMustacheParsingErrorsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5623B795152731B600DF16A6 /* GRMustacheParsingErrorsTest.m */; };
ABAF867016A0A65A001ADE96 /* GRPreventNSUndefinedKeyExceptionAttackTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 567AEC47152789FF0009CA61 /* GRPreventNSUndefinedKeyExceptionAttackTest.m */; };
Expand Down Expand Up @@ -410,7 +414,7 @@
563D66D615264739008628C5 /* sections.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = sections.json; sourceTree = "<group>"; };
563D66E81526497E008628C5 /* GRMustacheSuitesTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheSuitesTest.m; sourceTree = "<group>"; };
563D66EC152649DF008628C5 /* GRMustacheContextPrivateTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheContextPrivateTest.m; sourceTree = "<group>"; };
563D66EE152649DF008628C5 /* GRMustacheParserTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheParserTest.m; sourceTree = "<group>"; };
563D66EE152649DF008628C5 /* GRMustacheExpressionParserTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheExpressionParserTest.m; sourceTree = "<group>"; };
563D66F315264B40008628C5 /* GRMustacheSuites */ = {isa = PBXFileReference; lastKnownFileType = folder; path = GRMustacheSuites; sourceTree = "<group>"; };
563D670115264EDA008628C5 /* JRSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JRSwizzle.h; sourceTree = "<group>"; };
563D670215264EDA008628C5 /* JRSwizzle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JRSwizzle.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -460,6 +464,8 @@
5682B4BD1528DF3D00ADD123 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
5682B4BF1528DF4900ADD123 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.1.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
5682B4C41528E0C500ADD123 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.1.sdk/System/Library/Frameworks/CoreData.framework; sourceTree = DEVELOPER_DIR; };
568ECC30175DB0CC00F1178F /* GRMustacheExpressionParser_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GRMustacheExpressionParser_private.h; sourceTree = "<group>"; };
568ECC31175DB0CD00F1178F /* GRMustacheExpressionParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheExpressionParser.m; sourceTree = "<group>"; };
56907EE515FC752E0081BC2A /* GRMustacheExpression.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheExpression.m; sourceTree = "<group>"; };
56907F161604B5C50081BC2A /* GRMustacheFilterTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GRMustacheFilterTest.m; sourceTree = "<group>"; };
569EB2E3164030E000C09632 /* GRMustacheAccumulatorTag_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GRMustacheAccumulatorTag_private.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -944,6 +950,8 @@
56DEC311152631A30031E8DC /* Parsing */ = {
isa = PBXGroup;
children = (
568ECC30175DB0CC00F1178F /* GRMustacheExpressionParser_private.h */,
568ECC31175DB0CD00F1178F /* GRMustacheExpressionParser.m */,
56DEC2B8152631300031E8DC /* GRMustacheParser_private.h */,
56DEC2B7152631300031E8DC /* GRMustacheParser.m */,
56DEC2B0152631300031E8DC /* GRMustacheTemplateRepository.h */,
Expand Down Expand Up @@ -1011,7 +1019,7 @@
567AEC47152789FF0009CA61 /* GRPreventNSUndefinedKeyExceptionAttackTest.m */,
56353F8A1527963B00226C92 /* GRPreventNSUndefinedKeyExceptionAttackTest.xcdatamodeld */,
563D66EC152649DF008628C5 /* GRMustacheContextPrivateTest.m */,
563D66EE152649DF008628C5 /* GRMustacheParserTest.m */,
563D66EE152649DF008628C5 /* GRMustacheExpressionParserTest.m */,
);
path = Private;
sourceTree = "<group>";
Expand Down Expand Up @@ -1139,6 +1147,7 @@
56E2F30116C013CF00F01DC2 /* GRMustacheJavascriptLibrary_private.h in Headers */,
56E2F30D16C0166E00F01DC2 /* GRMustacheURLLibrary_private.h in Headers */,
56E2F31316C0527500F01DC2 /* GRMustacheHTMLLibrary_private.h in Headers */,
568ECC32175DB0D000F1178F /* GRMustacheExpressionParser_private.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1188,6 +1197,7 @@
56E2F30216C013CF00F01DC2 /* GRMustacheJavascriptLibrary_private.h in Headers */,
56E2F30E16C0166E00F01DC2 /* GRMustacheURLLibrary_private.h in Headers */,
56E2F31416C0527500F01DC2 /* GRMustacheHTMLLibrary_private.h in Headers */,
568ECC33175DB0D000F1178F /* GRMustacheExpressionParser_private.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1501,6 +1511,7 @@
56E2F30316C013CF00F01DC2 /* GRMustacheJavascriptLibrary.m in Sources */,
56E2F30F16C0166E00F01DC2 /* GRMustacheURLLibrary.m in Sources */,
56E2F31516C0527500F01DC2 /* GRMustacheHTMLLibrary.m in Sources */,
568ECC34175DB0D000F1178F /* GRMustacheExpressionParser.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -1515,7 +1526,7 @@
56DEC3C915263AC80031E8DC /* JSONKit.m in Sources */,
563D66E91526497E008628C5 /* GRMustacheSuitesTest.m in Sources */,
563D66EF152649DF008628C5 /* GRMustacheContextPrivateTest.m in Sources */,
563D66F1152649DF008628C5 /* GRMustacheParserTest.m in Sources */,
563D66F1152649DF008628C5 /* GRMustacheExpressionParserTest.m in Sources */,
560CE8921526F673004F935E /* GRBooleanTest.m in Sources */,
5623B796152731B600DF16A6 /* GRMustacheParsingErrorsTest.m in Sources */,
567AEC4A152789FF0009CA61 /* GRPreventNSUndefinedKeyExceptionAttackTest.m in Sources */,
Expand Down Expand Up @@ -1583,6 +1594,7 @@
56E2F30416C013CF00F01DC2 /* GRMustacheJavascriptLibrary.m in Sources */,
56E2F31016C0166E00F01DC2 /* GRMustacheURLLibrary.m in Sources */,
56E2F31616C0527500F01DC2 /* GRMustacheHTMLLibrary.m in Sources */,
568ECC35175DB0D000F1178F /* GRMustacheExpressionParser.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -1597,7 +1609,7 @@
56DEC3CA15263AC80031E8DC /* JSONKit.m in Sources */,
563D66EA1526497E008628C5 /* GRMustacheSuitesTest.m in Sources */,
563D66F0152649DF008628C5 /* GRMustacheContextPrivateTest.m in Sources */,
563D66F2152649DF008628C5 /* GRMustacheParserTest.m in Sources */,
563D66F2152649DF008628C5 /* GRMustacheExpressionParserTest.m in Sources */,
560CE8911526F672004F935E /* GRBooleanTest.m in Sources */,
5623B797152731B600DF16A6 /* GRMustacheParsingErrorsTest.m in Sources */,
567AEC4B152789FF0009CA61 /* GRPreventNSUndefinedKeyExceptionAttackTest.m in Sources */,
Expand Down Expand Up @@ -1642,7 +1654,7 @@
ABAF866916A0A65A001ADE96 /* GRSpecificationSuitesTest.m in Sources */,
ABAF866B16A0A65A001ADE96 /* GRMustacheSuitesTest.m in Sources */,
ABAF866C16A0A65A001ADE96 /* GRMustacheContextPrivateTest.m in Sources */,
ABAF866D16A0A65A001ADE96 /* GRMustacheParserTest.m in Sources */,
ABAF866D16A0A65A001ADE96 /* GRMustacheExpressionParserTest.m in Sources */,
ABAF866E16A0A65A001ADE96 /* GRBooleanTest.m in Sources */,
ABAF866F16A0A65A001ADE96 /* GRMustacheParsingErrorsTest.m in Sources */,
ABAF867016A0A65A001ADE96 /* GRPreventNSUndefinedKeyExceptionAttackTest.m in Sources */,
Expand Down
Loading

0 comments on commit dcaa98a

Please sign in to comment.