Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/ofborg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 128de05e0571
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 20bb9e53ba3f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 23, 2019

  1. Parse @ofborg invocation

    @Ekleog
    Ekleog committed Jun 23, 2019
    Copy the full SHA
    2c8e1fa View commit details

Commits on Jul 3, 2019

  1. Merge pull request #373 from Ekleog/parse-ofborg 

    Parse @ofborg invocation
    @grahamc
    grahamc authored Jul 3, 2019
    Copy the full SHA
    20bb9e5 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 ofborg/src/commentparser.rs
10 changes: 5 additions & 5 deletions ofborg/src/commentparser.rs
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ named!(normal_token(CompleteStr) -> CompleteStr,
named!(parse_line_impl(CompleteStr) -> Option<Vec<Instruction>>, alt!(
do_parse!(
res: ws!(many1!(ws!(preceded!(
tag_no_case!("@grahamcofborg"),
alt!(tag_no_case!("@grahamcofborg") | tag_no_case!("@ofborg")),
alt!(
ws!(do_parse!(
tag!("build") >>
@@ -129,7 +129,7 @@ mod tests {
parse(
"
@grahamcofborg build bar
@grahamcofborg eval
@ofborg eval
@grahamcofborg build foo",
)
);
@@ -178,7 +178,7 @@ Also, just in case, let's try foo
vec![String::from("foo"), String::from("bar")]
),]),
parse(
"@GrahamCOfBorg build foo bar
"@OfBorg build foo bar
baz",
)
@@ -211,7 +211,7 @@ baz",
String::from("baz"),
]
),]),
parse("@GrahamCOfBorg build foo bar baz")
parse("@OfBorg build foo bar baz")
);
}

@@ -241,7 +241,7 @@ baz",
String::from("baz.Baz"),
]
),]),
parse("@grahamcofborg build foo bar baz.Baz")
parse("@ofborg build foo bar baz.Baz")
);
}