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: m-labs/flickernoise
base: 2aa0d1f
Choose a base ref
...
head repository: m-labs/flickernoise
compare: 152aaf7
Choose a head ref
  • 17 commits
  • 26 files changed
  • 1 contributor

Commits on Dec 12, 2011

  1. compiler: don't feed TOK_ERROR to the parser

    TOK_ERROR returned after a scanner failure was still sent to the
    parser, forcing a parse error as well. While this didn't have any
    ill effects, it's better to disentangle the two.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    5c6bc3e View commit details
    Browse the repository at this point in the history
  2. compiler: report the line number and the context of an error

    We'll need this when the compiler parses the entire patch, not just
    an expression.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    6243f9f View commit details
    Browse the repository at this point in the history
  3. compiler: remove trailing whitespace

    Some lines had trailing tabs and spaces. Get rid of them.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    6b64d3a View commit details
    Browse the repository at this point in the history
  4. compiler: return error string from fpvm_parse

    This way, the caller has access to the full diagnostics.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    004c678 View commit details
    Browse the repository at this point in the history
  5. compiler: fix multiple /* ... */ comments

    The regexp was too greedy and treated  /* ... */ ... /* ... */ as
    a single long comment. Luckily, others have already solved that
    braintwister for us. This is the solution by Stephen Ostermiller.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    75e5cf7 View commit details
    Browse the repository at this point in the history
  6. compiler: bring out errors encountered by things called from parser

    This seems awkward but works. Maybe there's a better way. lemon
    documentation is silent about handling this kind of errors, and
    the results found when googing for lemon and YYABORT aren't
    encouraging.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    1a02099 View commit details
    Browse the repository at this point in the history
  7. compiler: moved prologue and epilogue to almost regular .fnp files

    They only differ in not having the per_frame= and per_vertex= prefixes.
    The files are then converted to a header containing #defines of strings
    with the file content inside. The compiler simply calls fpvm_chunk to
    compile the prologue and epilogue.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    ec9fbb4 View commit details
    Browse the repository at this point in the history
  8. compiler: ignore [preset]

    The original MilkDrop presets are based on INF files and have a
    "[preset]" at the beginning that should be ignored.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    cad31ca View commit details
    Browse the repository at this point in the history
  9. compiler: infrastructure for supporting fragment selection prefixes

    There are two changes:
    - instead of calling fpvm_do_assign directly, use a callback
    - support for pre_frame, per_vertex, and per_pixel prefixes
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    1d5a9a3 View commit details
    Browse the repository at this point in the history
  10. compiler: support parsing imagefileN as well

    This was tricky: since file names are bare and can contain all kinds of
    special characters and keywords, we need to switch the scanner into a
    different mode, which is a little awkward with re2c.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    1b0a5d4 View commit details
    Browse the repository at this point in the history
  11. compiler: dirty hacks to work around syntax problems in patches

    This commit makes the parser accept the following constructs:
    
    - per_frameinit_1=...	(becomes per_frame=)
    - per_frame=		(or per_vertex; is ignored)
    - per_frame=//...	(or per_vertex; is ignored)
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    35c6131 View commit details
    Browse the repository at this point in the history
  12. compiler: make regression tester support per_frame and per_vertex as …

    …well
    
    Trival. Should have done this earlier.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    f840e81 View commit details
    Browse the repository at this point in the history
  13. patches: fix syntax error in Balk Acid (DMX madness)

    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    081b9ee View commit details
    Browse the repository at this point in the history
  14. compiler: don't regularly use " in error messages; nicer format

    MTK doesn't like strings containing double quotes. We can work around
    this by minimizing the use of double quotes sent to MTK.
    
    Since this changes all the error messages in the regression tests
    anyway, we can use the opportunity and also make the message format
    a little nicer.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    10cbd9f View commit details
    Browse the repository at this point in the history
  15. compiler: replace the DIY parser in compiler.c

    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    763007f View commit details
    Browse the repository at this point in the history
  16. compiler: remove fpvm_assign

    We don't need it anymore.
    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    1ecf4d1 View commit details
    Browse the repository at this point in the history
  17. compiler: parse all patches in the regression test

    wpwrak authored and Sebastien Bourdeauducq committed Dec 12, 2011
    Copy the full SHA
    152aaf7 View commit details
    Browse the repository at this point in the history