DSL was a bad idea lets just use JS

Author: kirjavascript

README.md

@@ -4,9 +4,7 @@
 </div>
 <br>
 
-Flex 2 is a multi-purpose art and mapping editor for the Sega Megadrive. The original Flex was a web app, which gave it several limitations. A full rewrite for desktop opens up the ability to use real project files, as well as various other improvements.
-
-Much inspiration has come from the tools SonMapEd, SpritePlotter, and SonikSprite.
+Flex 2 is a multi-purpose sprite editor for the Sega Megadrive
 
 # [download](https://github.com/kirjavascript/Flex2/releases)
 

TODO

@@ -21,7 +21,6 @@ checkbox
 buffer is deprecated on save
 ==
 CUSTOM FORMATS
-parser combinators
 specify mapping definition files or presets
 disable optimizations
 ==

app/components/art/tile.js

@@ -1,7 +1,6 @@
 import React, { Component } from 'react';
 import { environment } from '#store/environment';
 import { observer } from 'mobx-react';
-import SVARS from '!!sass-variables-loader!#styles/variables.scss';
 
 @observer
 export class Tile extends Component {

app/formats/lang/docs.txt

@@ -28,22 +28,25 @@ top left right down TLRD
 // (offset #$0) in File menu default
 
 ; sonic 1 mapping
-(header dc.b)
+(offset-table dc.b)
 (mapping TTTTTTTT 0000  WW HH P CC Y X AAAAAAAAAAA LLLLLLLL)
 
-; TODO - two player data
+; sonic 2 mapping
 
 ; sonic 1 dplc
 (offset-table db.b)
+(dplc-header LLLL)
 (dplc NNNN AAAA AAAA AAAA)
 
 ; sonic 2/3&k dplc
 (offset-table dc.w)
-(dplc (length dc.w) (def NNNN AAAA AAAA AAAA))
+(dplc-header LLLLLLLL)
+(dplc NNNN AAAA AAAA AAAA)
 
 ; sonic 2/3&k non-player dplc
 (offset-table dc.w)
-(dplc (sub.w #$1 (length dc.w)) (def AAAA AAAA AAAA NNNN))
+(dplc-header (sub #1 LLLL))
+(dplc AAAA AAAA AAAA NNNN)
 
 (loop (length) (dplc XXXX))
 

app/formats/lang/output.js

@@ -0,0 +1,3 @@
+import { environment } from '#store/environment';
+
+// BIN/ASM

app/formats/lang/parse.js

@@ -29,17 +29,8 @@ const whitespace = rawWhitespace.map(() => whitespaceSymbol);
 const parser = recursiveParser(() => many(choice ([
     whitespace,
     comment,
-    // sexpr,
-  // parseNumber,
-  // parseBool,
-  // parseNull,
-  // parseString,
-  // parseArray,
-  // parseObject,
-    // parseString,
     info,
     dplc,
-    add,
 ]))).map(items => items.filter(d => d !== whitespaceSymbol));
 
 const param = (param) => composeParsers([param, whitespace]);
@@ -76,8 +67,6 @@ const number = choice([
     ]).map(([, hex]) => +`0x${hex}`),
 ]);
 
-// spread
-
 const tokenList = {
     'T': 'top',
     'L': 'left',
@@ -103,7 +92,7 @@ const definition = recursiveParser(() => many(choice([
     reverse,
 ])));
 
-// operation
+
 
 const add = sexpr(() => [
     str('add'),
@@ -121,20 +110,20 @@ const dplc = sexpr(() => [
     sepBy(whitespace)(definition),
 ]).map(([, expr]) => ({ type: 'dplc', expr }));
 
+// definition list
+// operation
+// size
 
 
 
 
-// ASM & binary out first
+// ASM & binary out first (tedmediate format)
+//
+// read / write
+//
 // be able to parse from bits to byte / word / long
 // then do operations
 // definition
-// add sub reverse
-
-// const join = seperator => array => array.join(seperator);
-// const escapedQuote = sequenceOf ([ str ('\\'), anyOfString (`"'`) ]).map(x => x.join(''));
-
-
 
 // const parseString = sequenceOf([
 //     char('"'),
@@ -143,9 +132,12 @@ const dplc = sexpr(() => [
 // ]).map(([,x]) => ({string:x}));
 
 const input = `
-( info ) ; this is a comment
-( dplc YXYA (reverse (add #$1 AAA)))
-( dplc AAAA AAAA (add #3 AAA) )
+(offset-table dc.b)
+(mapping-header LLLL)
+(mapping TTTTTTTT 0000  WW HH P CC Y X AAAAAAAAAAA LLLLLLLL)
+;(info) ; this is a comment
+;( dplc YXYA (reverse (add #$1 AAA)))
+;( dplc AAAA AAAA (add #3 AAA) )
 `;
 
 // whitespace symbol

app/formats/scripts/index.js

@@ -0,0 +1,19 @@
+// arbitrary code warning
+
+info();
+offsetTable(dc.b);
+mappingHeader(() => byte(Symbol('length')))
+mapping((sprite, i) => [
+    byte(sprite.top),
+    nybble(0),
+    bits(2, sprite.width - 1),
+    bits(2, sprite.height - 1),
+    bits(1, sprite.priority),
+    bits(2, sprite.palette),
+    bits(1, sprite.yflip),
+    bits(1, sprite.xflip),
+    bits(11, sprite.offset),
+    word(sprite.left),
+]);
+
+// need an external scrtipts folder copied to the root on bundle

app/main.js

@@ -25,4 +25,4 @@ document.addEventListener('drop', (e) => {
 }, false);
 
 console.log('todo: remove');
-require('#formats/lang/parse');
+require('#formats/scripts/index.js');