Permalink
Switch branches/tags
Nothing to show
Commits on Dec 3, 2012
  1. Merge pull request #17 from r3/master

    Havvy committed Dec 3, 2012
    Freshly baked tests
Commits on Nov 29, 2012
  1. Fixed tests to reflect current state of program (specs are the same, …

    r3 committed Nov 29, 2012
    …but tests
    
    needed to be fixed for minor changes in names and the like). Removed tests for
    extract_occurance as that function no longer exists. Tests cleaned a
    bit for readability. Added __eq__ method for tokens for comparing properly.
    Ammended lexer.pprint function to display the start and end attributes of each
    token. Removed trailing space in 'escape code.flux' example as it is no longer
    necessary. Speaking of which, we can easily support escaped spaces in var
    names if we wish now that we're lexing by line rather than by character.
    
    Oh, all tests pass.
Commits on Nov 23, 2012
  1. Merge pull request #16 from r3/master

    Havvy committed Nov 23, 2012
    Substantial Refactoring
Commits on Nov 22, 2012
  1. Changed lexer to deal with lines instead of characters. Increased per…

    r3 committed Nov 22, 2012
    …formance
    
    and simplified lexing process. Simplified regex for variable tokens so that
    they no longer require a trailing non-alphanumeric character.
  2. More cruft removed from lexer. Issue where variables require a

    r3 committed Nov 22, 2012
    non-alphanumeric char after the name to be recognized. This becomes a problem
    if there's a variable at the end of a line. Going to look at solutions in
    the lexer.
  3. Removed escaped space containing variable from example as we aren't g…

    r3 committed Nov 22, 2012
    …oing to
    
    support that (Weee!).
  4. Removed type annotations from lexer. Should use them everywhere if we…

    r3 committed Nov 22, 2012
    …'re to
    
    use them, and we shouldn't unless we actually USE them. Fixed minor issue in
    tokens where I included TEXT in the array of tokens, which breaks lots of
    things. Minor changes to template in nodes.
  5. Winter cleaning of code that I haven't touched in some time. Removed …

    r3 committed Nov 22, 2012
    …some
    
    undocumented cruft to 'abandoned' along with two lemmas. Stuff that might be
    useful someday, but not right now. Renamed parser.py to nodes.py as that's
    essentially what it contains. We already split the tokens from the lexer,
    might as well do the same with the nodes from the parser.
Commits on Aug 28, 2012
  1. Renamed both Parser and Lexer to lower case equivalent. Dropping supp…

    r3 committed Aug 28, 2012
    …ort for
    
    escaped spaces in variable names. Due to restructuring, tests are a long way
    from passing, but we'll get to it.
Commits on Aug 18, 2012
  1. Merge pull request #14 from r3/master

    Havvy committed Aug 18, 2012
    A shed of a different colour
Commits on Aug 10, 2012
  1. Tests fixed. Since we moved the tokens and inlined the char_stream fu…

    r3 committed Aug 10, 2012
    …nction,
    
    things needed to be changed a bit. All tests currently pass.
  2. Merged argparse into Lexer. Not everything is wired in, but we can ca…

    r3 committed Aug 10, 2012
    …ll it with
    
    a filename argument. Split lexical tokens out into tokens module.
Commits on Aug 8, 2012
  1. Merge pull request #13 from r3/master

    Havvy committed Aug 8, 2012
    Innoculation against stagnation
Commits on Aug 7, 2012
  1. Inlined Lexer.char_stream and made some progress on Parser. Fixed som…

    r3 committed Aug 7, 2012
    …e minor
    
    bugs in an example.
Commits on Jul 19, 2012
  1. Merge pull request #12 from r3/master

    Havvy committed Jul 19, 2012
    Tests n' Hacks
Commits on Jul 18, 2012
  1. Minor change to Lexer. Incremental changes (hacks) applied to Parser.…

    r3 committed Jul 18, 2012
    … Nothing
    
    solid yet.
Commits on Jul 17, 2012
  1. Merge pull request #11 from r3/master

    Havvy committed Jul 17, 2012
    Intro to Parsers
  2. Minor work on Parser

    r3 committed Jul 17, 2012
Commits on Jul 16, 2012
Commits on Jul 10, 2012
  1. Added an example of a syntax tree.

    Havvy committed Jul 10, 2012
Commits on Jun 17, 2012
Commits on Jun 6, 2012
  1. Merge pull request #10 from r3/master

    Havvy committed Jun 6, 2012
    Tiny Tincture
  2. Removed forgotten debug messages in Lexer, renamed an example file, and

    r3 committed Jun 6, 2012
    built new tests to handle current Lexer implementation based on example
    files. Lexer.lookup and Lexer.pprint_token_stream need tests, but all
    others are covered, and pass the tests.
Commits on Jun 4, 2012
  1. Merge pull request #9 from r3/master

    Havvy committed Jun 4, 2012
    Variables and Link Tokens
  2. Allowes for var names with escaped whitespace (VARIABLE token) and adds

    r3 committed Jun 4, 2012
    [[ and ]] tokens (OPEN_LINK & CLOSE_LINK). Included one link example for
    the link tokens and made the escape code example more complex.
    Everything parses properly.
Commits on Jun 3, 2012
  1. Another example.

    Havvy committed Jun 3, 2012
    This time DnD-Wiki's 3.5e Monster Classic template.
Commits on Jun 2, 2012
  1. Merge pull request #7 from r3/master

    Havvy committed Jun 2, 2012
    Sufficient Slaughter
  2. New algorithm for matching. Characters are stored in a buffer which is

    r3 committed Jun 2, 2012
    searched for occurances of token triggers (regex). On a match, a token
    is yielded. Text not matching a token found prior to a found match will
    be assumed to be text and consumed. Tokens are now simply namedtuples
    and the Tokens file has been merged into Lexer.py.
  3. Merge pull request #6 from r3/master

    Havvy committed Jun 2, 2012
    Just a flesh wound.
Commits on Jun 1, 2012
  1. Fixed issue where TEXT tokens morphed, causing the current char to be

    r3 committed Jun 1, 2012
    duplicated between that morphed TEXT and the next Token.
  2. Merge pull request #5 from r3/master

    Havvy committed Jun 1, 2012
    A minor surgery
  3. Argument parser written, but not integrated. Token scheme changed.

    r3 committed Jun 1, 2012
    Lexing is done without context, which is being assigned to the parser.
    Two extra examples, and test ammendments, though they're not currently
    up to date. Minor modifications to Lexer to reflect Token changes.
Commits on May 20, 2012
  1. Previous token was an extra declaration fixable by transposing two li…

    Havvy committed May 20, 2012
    …nes.
    
    I removed it, and renamed 'current' to 'state' and 'next_token' to
    'next_state'.