jdb/jlp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up whitespace. Fix Main-Class manifest entry.

Browse Source
This commit is contained in:
Jonathan Bernard 2016-01-26 01:47:01 -06:00
parent 7ef580ba17
commit 6d202a49d7
5 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
# J Literate Programming # J Literate Programming
* [Source](https://git.jdb-labs.com/jdb-labs/jlp) * [Source](https://git.jdb-labs.com/jdb-labs/jlp)
* [Annotated Source and Documentation](https://doc.jdb-labs.com/jlp/current/) * [Annotated Source and Documentation](https://doc.jdb-labs.com/jlp/current/)
## Overview ## Overview

21
build.gradle
View File

@ -2,26 +2,25 @@ apply plugin: "groovy"
apply plugin: "maven" apply plugin: "maven"
group = "com.jdblabs" group = "com.jdblabs"
version = "1.9" version = "1.10"
repositories { repositories {
mavenLocal() mavenLocal()
mavenCentral() } mavenCentral() }
dependencies { dependencies {
compile 'org.codehaus.groovy:groovy-all:2.3.6' compile 'org.codehaus.groovy:groovy-all:[2.4.0,)'
compile 'org.pegdown:pegdown:1.4.2' compile 'org.pegdown:pegdown:[1.6.0,)'
compile 'org.slf4j:slf4j-api:1.7.10' compile 'org.slf4j:slf4j-api:[1.7.10,)'
compile 'ch.qos.logback:logback-core:1.1.2' compile 'ch.qos.logback:logback-core:[1.1.2,)'
compile 'ch.qos.logback:logback-classic:1.1.2' compile 'ch.qos.logback:logback-classic:[1.1.2,)'
compile 'commons-cli:commons-cli:1.2' compile 'commons-cli:commons-cli:[1.2,)'
compile 'org.apache.commons:commons-lang3:3.3.2' compile 'org.apache.commons:commons-lang3:[3.3.2,)'
compile 'com.jdbernard:jdb-util:3.4' compile 'com.jdbernard:jdb-util:[4.0,)'
compile 'org.pegdown:pegdown:1.4.2'
} }
jar { jar {
manifest { manifest {
attributes("Main-Class": "com.jdbernard.remindme.DailyAgenda") attributes("Main-Class": "com.jdblabs.jlp.JLPMain")
} }
} }

8
src/main/groovy/com/jdblabs/jlp/JLPMain.groovy
View File

@ -19,7 +19,7 @@ import org.slf4j.LoggerFactory
*/ */
public class JLPMain { public class JLPMain {
public static final String VERSION = "1.9" public static final String VERSION = "1.10"
private static Logger log = LoggerFactory.getLogger(JLPMain.class) private static Logger log = LoggerFactory.getLogger(JLPMain.class)
@ -113,7 +113,7 @@ public class JLPMain {
/// Resolve the file against our relative root. /// Resolve the file against our relative root.
if (!cssFile.isAbsolute()) { if (!cssFile.isAbsolute()) {
cssFile = new File(pathRoot, cssFile.path) } cssFile = new File(pathRoot, cssFile.path) }
/// Finally, make sure the CSS file actually exists. /// Finally, make sure the CSS file actually exists.
if (cssFile.exists()) { if (cssFile.exists()) {
css = cssFile css = cssFile
@ -142,14 +142,14 @@ public class JLPMain {
/// For each filename we try to resolve it to an actual file /// For each filename we try to resolve it to an actual file
/// relative to our root. /// relative to our root.
File file = new File(filename) File file = new File(filename)
if (!file.isAbsolute()) { file = new File(pathRoot, filename) } if (!file.isAbsolute()) { file = new File(pathRoot, filename) }
/// If this file does not exist, warn the user and skip it. /// If this file does not exist, warn the user and skip it.
if (!file.exists()) { if (!file.exists()) {
System.err.println( System.err.println(
"'${file.canonicalPath}' does not exist: ignored.") "'${file.canonicalPath}' does not exist: ignored.")
return } return }
/// If this file is a directory, we want to add all the files in it /// If this file is a directory, we want to add all the files in it
/// to our input list, recursing into all the subdirectories and /// to our input list, recursing into all the subdirectories and
/// adding their files as well. We will ignore hidden files. /// adding their files as well. We will ignore hidden files.

48
src/main/groovy/com/jdblabs/jlp/JLPPegParser.java
View File

@ -124,7 +124,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
public Rule SourceFile() { public Rule SourceFile() {
return Sequence( return Sequence(
/// At the start of processing a new SourceFile, we need to set up /// At the start of processing a new SourceFile, we need to set up
/// our internal state. /// our internal state.
/// Clear the line count. /// Clear the line count.
clearLineCount(), clearLineCount(),
@ -139,7 +139,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
FirstOf( FirstOf(
/// Match a whole Block. This pushes a Block on the stack. /// Match a whole Block. This pushes a Block on the stack.
Block(), Block(),
/// A standalone DocBlock. We will create an empty CodeBlock /// A standalone DocBlock. We will create an empty CodeBlock
/// to pair with it, then push a new Block onto the stack /// to pair with it, then push a new Block onto the stack
@ -218,7 +218,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
Rule DocBlock() { return FirstOf(SDocBlock(), MDocBlock()); } Rule DocBlock() { return FirstOf(SDocBlock(), MDocBlock()); }
/** /**
* #### SDocBlock * #### SDocBlock
* Parses the rule: * Parses the rule:
* *
* SDocBlock = (SDirective / SDocText)+ * SDocBlock = (SDirective / SDocText)+
@ -235,7 +235,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
addToDocBlock((ASTNode) pop())))); } addToDocBlock((ASTNode) pop())))); }
/** /**
* #### MDocBlock * #### MDocBlock
* Parses the rule: * Parses the rule:
* *
* MDocBlock = MDOC_START (MDirective / MDocText)+ MDOC_END * MDocBlock = MDOC_START (MDirective / MDocText)+ MDOC_END
@ -257,7 +257,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
addToDocBlock((ASTNode) pop()))), addToDocBlock((ASTNode) pop()))),
MDOC_END); } MDOC_END); }
/** /**
* #### CodeBlock * #### CodeBlock
* Parses the rule: * Parses the rule:
* *
* CodeBlock = (RemainingCodeLine)+ * CodeBlock = (RemainingCodeLine)+
@ -273,7 +273,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
addToCodeBlock(match())))); } addToCodeBlock(match())))); }
/** /**
* #### SDirective * #### SDirective
* Parses the rule: * Parses the rule:
* *
* SDirective = SDocLineStart AT (SLongDirective / SShortDirective) * SDirective = SDocLineStart AT (SLongDirective / SShortDirective)
@ -287,7 +287,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
SDocLineStart(), AT, FirstOf(SLongDirective(), SShortDirective())); } SDocLineStart(), AT, FirstOf(SLongDirective(), SShortDirective())); }
/** /**
* #### MDirective * #### MDirective
* Parses the rule: * Parses the rule:
* *
* MDirective = MDocLineStart? AT (MLongDirective / MShortDirective) * MDirective = MDocLineStart? AT (MLongDirective / MShortDirective)
@ -302,7 +302,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
AT, FirstOf(MLongDirective(), MShortDirective())); } AT, FirstOf(MLongDirective(), MShortDirective())); }
/** /**
* #### SLongDirective * #### SLongDirective
* Parses the rule: * Parses the rule:
* *
* SLongDirective = * SLongDirective =
@ -323,15 +323,15 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
SDocText(), SDocText(),
swap(), swap(),
push(popAsString() + ((DocText) pop()).value))), push(popAsString() + ((DocText) pop()).value))),
push(new Directive(popAsString(), popAsString(), popAsInt(), push(new Directive(popAsString(), popAsString(), popAsInt(),
(DocBlock)peek()))); } (DocBlock)peek()))); }
/** /**
* #### MLongDirective * #### MLongDirective
* Parses the rule: * Parses the rule:
* *
* MLongDirective = * MLongDirective =
* (API_DIR / EXAMPLE_DIR / PARAM_DIR) RemainingMDocLine MDocText? * (API_DIR / EXAMPLE_DIR / PARAM_DIR) RemainingMDocLine MDocText?
* *
* Pushes a [`Directive`] node onto the stack. * Pushes a [`Directive`] node onto the stack.
@ -354,7 +354,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
(DocBlock) peek()))); } (DocBlock) peek()))); }
/** /**
* #### SShortDirective * #### SShortDirective
* Parses the rule: * Parses the rule:
* *
* SShortDirective = * SShortDirective =
@ -370,12 +370,12 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
push(curLineNum), push(curLineNum),
FirstOf(AUTHOR_DIR, ORG_DIR, INCLUDE_DIR, COPYRIGHT_DIR), push(match()), FirstOf(AUTHOR_DIR, ORG_DIR, INCLUDE_DIR, COPYRIGHT_DIR), push(match()),
RemainingSDocLine(), RemainingSDocLine(),
push(new Directive(match().trim(), popAsString(), popAsInt(), push(new Directive(match().trim(), popAsString(), popAsInt(),
(DocBlock) peek()))); } (DocBlock) peek()))); }
/** /**
* #### MShortDirective * #### MShortDirective
* Parses the rule: * Parses the rule:
* *
* MShortDirective = * MShortDirective =
@ -396,7 +396,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
(DocBlock) peek()))); } (DocBlock) peek()))); }
/** /**
* #### SDocText * #### SDocText
* Parses the rule: * Parses the rule:
* *
* SDocText = (SDocLineStart !AT RemainingSDocLine)+ * SDocText = (SDocLineStart !AT RemainingSDocLine)+
@ -413,7 +413,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
addToDocText(match())))); } addToDocText(match())))); }
/** /**
* #### MDocText * #### MDocText
* Parses the rule: * Parses the rule:
* *
* MDocText = (MDocLineStart? !AT RemainingMDocLine)+ * MDocText = (MDocLineStart? !AT RemainingMDocLine)+
@ -431,7 +431,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
addToDocText(match())))); } addToDocText(match())))); }
/** /**
* #### SDocLineStart * #### SDocLineStart
* Parses the rule: * Parses the rule:
* *
* SDocLineStart = SPACE* SDOC_START SPACE? * SDocLineStart = SPACE* SDOC_START SPACE?
@ -441,7 +441,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
ZeroOrMore(SPACE), SDOC_START, Optional(SPACE)); } ZeroOrMore(SPACE), SDOC_START, Optional(SPACE)); }
/** /**
* #### MDocLineStart * #### MDocLineStart
* Parses the rule: * Parses the rule:
* *
* MDocLineStart = SPACE* !MDOC_END MDOC_LINE_START SPACE? * MDocLineStart = SPACE* !MDOC_END MDOC_LINE_START SPACE?
@ -451,7 +451,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
ZeroOrMore(SPACE), TestNot(MDOC_END), MDOC_LINE_START, Optional(SPACE)); } ZeroOrMore(SPACE), TestNot(MDOC_END), MDOC_LINE_START, Optional(SPACE)); }
/** /**
* #### RemainingSDocLine * #### RemainingSDocLine
* Parses the rule: * Parses the rule:
* *
* RemainingSDocLine = ((!EOL)* EOL) / ((!EOL)+ EOI) * RemainingSDocLine = ((!EOL)* EOL) / ((!EOL)+ EOI)
@ -462,10 +462,10 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
Sequence(OneOrMore(NOT_EOL), EOI, incLineCount())); } Sequence(OneOrMore(NOT_EOL), EOI, incLineCount())); }
/** /**
* #### RemainingMDocLine * #### RemainingMDocLine
* Parses the rule: * Parses the rule:
* *
* RemainingMDocLine = * RemainingMDocLine =
* ((!(EOL / MDOC_END))* EOL) / * ((!(EOL / MDOC_END))* EOL) /
* ((!MDOC_END)+) * ((!MDOC_END)+)
*/ */
@ -481,10 +481,10 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
OneOrMore(Sequence(TestNot(MDOC_END), ANY))); } OneOrMore(Sequence(TestNot(MDOC_END), ANY))); }
/** /**
* #### RemainingCodeLine * #### RemainingCodeLine
* Parses the rule: * Parses the rule:
* *
* RemainingCodeLine = * RemainingCodeLine =
* ((!(EOL / MDOC_START / SDocLineStart))* EOL) / * ((!(EOL / MDOC_START / SDocLineStart))* EOL) /
* (!(MDOC_START / SDocLineStart))+ * (!(MDOC_START / SDocLineStart))+
*/ */
@ -565,7 +565,7 @@ public class JLPPegParser extends BaseParser<Object> implements JLPParser {
docBlock.docTexts.add((DocText) an); } docBlock.docTexts.add((DocText) an); }
else { throw new IllegalStateException(); } else { throw new IllegalStateException(); }
return push(docBlock); } return push(docBlock); }
boolean addToCodeBlock(String line) { boolean addToCodeBlock(String line) {
CodeBlock codeBlock = (CodeBlock) pop(); CodeBlock codeBlock = (CodeBlock) pop();
codeBlock.lines.put(curLineNum - 1, line); codeBlock.lines.put(curLineNum - 1, line);

18
src/main/groovy/com/jdblabs/jlp/Processor.groovy
View File

@ -125,7 +125,7 @@ public class Processor {
/// is more than one file with the same name we will include the /// is more than one file with the same name we will include the
/// file's parent directory as well. /// file's parent directory as well.
inputFiles.each { file -> inputFiles.each { file ->
// Get the relative path as path elements. // Get the relative path as path elements.
def relPath = getRelativeFilepath(inputRoot, file) def relPath = getRelativeFilepath(inputRoot, file)
def pathParts = relPath.split('/|\\\\') as List def pathParts = relPath.split('/|\\\\') as List
@ -160,7 +160,7 @@ public class Processor {
// TODO: better error detection and handling // TODO: better error detection and handling
currentDoc.sourceAST = parser.parse(currentDoc.sourceFile.text) currentDoc.sourceAST = parser.parse(currentDoc.sourceFile.text)
if (currentDoc.sourceAST == null) { if (currentDoc.sourceAST == null) {
log.warn("Unable to parse '{}'. Ignoring this document.", currentDocId) log.warn("Unable to parse '{}'. Ignoring this document.", currentDocId)
badDocs << currentDocId }} badDocs << currentDocId }}
@ -186,7 +186,7 @@ public class Processor {
/// * Write the output to the output directory. /// * Write the output to the output directory.
processDocs { processDocs {
/// Create the path and file object for the output file /// Create the path and file object for the output file
String relativePath = String relativePath =
getRelativeFilepath(inputRoot, currentDoc.sourceFile) getRelativeFilepath(inputRoot, currentDoc.sourceFile)
@ -238,7 +238,7 @@ public class Processor {
* : Return the link as-is. * : Return the link as-is.
* *
* *absolute path (starts with `/`)* * *absolute path (starts with `/`)*
* : Returns the link resolved against the output root. * : Returns the link resolved against the output root.
* *
* *relative path (no leading `/`)* * *relative path (no leading `/`)*
* : Returns the link resolved against the `TargetDoc` passed in. * : Returns the link resolved against the `TargetDoc` passed in.
@ -281,12 +281,12 @@ public class Processor {
case ~/^\w+:.*/: return link case ~/^\w+:.*/: return link
/// Absolute link, resolve relative to the output root. /// Absolute link, resolve relative to the output root.
case ~/^\/.*/: case ~/^\/.*/:
/// Our link should be the relative path (if needed) plus the /// Our link should be the relative path (if needed) plus the
/// link without the leading `/`. /// link without the leading `/`.
def relPath = getRelativeFilepath(targetDoc.sourceFile, inputRoot) def relPath = getRelativeFilepath(targetDoc.sourceFile, inputRoot)
return (relPath ? "${relPath}/" : "") + link[1..-1] return (relPath ? "${relPath}/" : "") + link[1..-1]
/// Relative link, resolve using the output root and the source /// Relative link, resolve using the output root and the source
/// document relative to the input root. /// document relative to the input root.
default: default:
@ -295,7 +295,7 @@ public class Processor {
/** /**
* #### getRelativeFilepath * #### getRelativeFilepath
* Assuming our current directory is `root`, get the relative path to * Assuming our current directory is `root`, get the relative path to
* `file`. * `file`.
* @org jlp.jdb-labs.com/Processor/getRelativeFilepath * @org jlp.jdb-labs.com/Processor/getRelativeFilepath
*/ */
@ -329,7 +329,7 @@ public class Processor {
* #### getCommonParent * #### getCommonParent
* Find the common parent directory to the given files. * Find the common parent directory to the given files.
* @org jlp.jdb-labs.com/Processor/getCommonParent * @org jlp.jdb-labs.com/Processor/getCommonParent
*/ */
public static File getCommonParent(File file1, File file2) { public static File getCommonParent(File file1, File file2) {
def path1 = file1.canonicalPath.split('/|\\\\') def path1 = file1.canonicalPath.split('/|\\\\')
def path2 = file2.canonicalPath.split('/|\\\\') def path2 = file2.canonicalPath.split('/|\\\\')
@ -339,7 +339,7 @@ public class Processor {
int i = 0 int i = 0
while (i < Math.min(path1.length, path2.length) && while (i < Math.min(path1.length, path2.length) &&
path1[i] == path2[i]) { path1[i] == path2[i]) {
newPath << path2[i] newPath << path2[i]
i++ } i++ }