[WIP] Add proper Repl #488

Stupremee · 2020-07-24T21:25:41Z

This PR will introduce a proper Repl using rustyline and the jit backend.

Only merge if #493 is merged
Resolves #372

- Move binaries into `bin` folder - History support - Command hinting - Matching bracket highlighting

jyn514

Looks like a good skeleton to add more features onto :)

src/bin/repl/helper.rs

src/bin/repl/mod.rs

src/bin/repl/commands.rs

src/bin/repl/helper.rs

src/bin/repl/mod.rs

src/bin/swcci.rs

- repl history is now saved in data_dir

- Any expression will be wrapped in a function - This function will be transmute'd into a rust function and then be called. - NOTE: Code doesn't compile right now.

jyn514

Quick look, I haven't seen all of it.

jyn514 · 2020-07-25T12:02:34Z

src/bin/repl/helper.rs

+        if !start.starts_with(PREFIX) {
+            return None;
+        }
+        let start = &start[1..];


I'm not sure you need to abstract over the prefix, but if you do, be consistent:

Suggested change

let start = &start[1..];

let start = &start[PREFIX.len()..];

src/bin/repl/mod.rs

jyn514 · 2020-08-03T23:21:44Z

src/bin/repl/mod.rs

+        }),
+        storage_class: data::StorageClass::Extern,
+        qualifiers: Default::default(),
+        id: saltwater::InternedStr::get_or_intern("execute"),


Suggested change

id: saltwater::InternedStr::get_or_intern("execute"),

id: "execute".into(),

jyn514 · 2020-08-03T23:24:06Z

src/bin/repl/mod.rs

+        // FIXME: Currently doesn't work. Just make insert() pub?
+        symbol: fun.insert(),


Hmm, the reason I make this private was because I was thinking about parsing and didn't want people to accidentally add a new identifier ... but it does seem like that would be a major use case for any programmatic use. I'm fine with making it public :)

jyn514 · 2020-08-03T23:26:23Z

src/bin/repl/mod.rs

+    // FIXME: error_handler is private so this doesn't work right now.
+    // Please review and propose a solution.
+    // if let Some(err) = analyzer.error_handler.pop_front() {
+    //     return Err(err);
+    // }


Oops, there isn't actually a way to get errors from PureAnalyzer.

@pythondude325 I think we could add an errors() method here? Where it just returns mem::take(&mut self.error_handler)?

jyn514 · 2020-08-03T23:27:52Z

src/bin/swcc.rs

@@ -554,7 +554,7 @@ mod backtrace {

 #[cfg(feature = "salty")]
 fn play_scream() -> Result<(), ()> {
-    const SCREAM: &[u8] = include_bytes!("data/R2D2-Scream.ogg");
+    const SCREAM: &[u8] = include_bytes!("../data/R2D2-Scream.ogg");


Suggested change

const SCREAM: &[u8] = include_bytes!("../data/R2D2-Scream.ogg");

const SCREAM: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "data/R2D2-Scream.ogg")));

- Add errors method to ErrorHandler - Make `Variable::insert` pub

jyn514 · 2020-08-04T13:13:48Z

src/bin/repl/mod.rs

+macro_rules! execute {
+    ($fun:ident, $ty:path, $action:expr) => {
+        $action(unsafe {
+            let execute: unsafe extern "C" fn() -> $ty = std::mem::transmute($fun);
+            execute()
+        });
+    };
+}


This is used like

execute!(fun, bool, |b| println!("=> {}", b)),

I think it would be easier and simpler to do println!("=> {}", execute!(fun, bool)), which means you don't need $action or to create a new closure.

jyn514 · 2020-08-04T13:20:41Z

src/bin/repl/mod.rs

+            Type::Float => execute!(fun, f32, |f| println!("=> {}", f)),
+            Type::Double => execute!(fun, f64, |f| println!("=> {}", f)),
+
+            Type::Char(_) => execute!(fun, char, |c| println!("=> {}", c)),


This doesn't look quite right ... in Rust, char is a unicode scalar character which is represented as 4 bytes. In C, it's an arbitrary byte, which could be invalid utf8 (0xff).

Suggested change

Type::Char(_) => execute!(fun, char, |c| println!("=> {}", c)),

Type::Char(_) => execute!(fun, u8, |c| println!("=> {}", if c.is_ascii() { c as char } else { `hex::encode(&[c]) })),

https://docs.rs/hex/0.4.2/hex/fn.encode.html

jyn514 · 2020-08-04T13:21:30Z

src/bin/repl/mod.rs

+            Type::Void => unsafe {
+                let execute: unsafe extern "C" fn() = std::mem::transmute(fun);
+                execute()
+            },


Suggested change

Type::Void => unsafe {

let execute: unsafe extern "C" fn() = std::mem::transmute(fun);

execute()

},

Type::Void => execute!(fun, (), |_| {}),

Stupremee · 2020-09-08T15:45:00Z

I have to reopen because I accidentally deleted my fork (:sweat_smile:)

Stupremee added 2 commits July 24, 2020 23:23

Start to implement REPL

aade798

- Move binaries into `bin` folder - History support - Command hinting - Matching bracket highlighting

Command completion works

ec8ec36

jyn514 reviewed Jul 24, 2020

View reviewed changes

Stupremee added 3 commits July 25, 2020 11:20

Cleanup some code

53ac521

- repl history is now saved in data_dir

Fix broken r2d2 scream path

bfe1441

Code execution in repl works now

33619bb

- Any expression will be wrapped in a function - This function will be transmute'd into a rust function and then be called. - NOTE: Code doesn't compile right now.

jyn514 reviewed Aug 3, 2020

View reviewed changes

Stupremee added 2 commits August 4, 2020 13:05

Cleanup some code

72093ed

- Add errors method to ErrorHandler - Make `Variable::insert` pub

Add more number types to repl and make ir public

3f950e8

jyn514 reviewed Aug 4, 2020

View reviewed changes

jyn514 mentioned this pull request Aug 15, 2020

Start on splitting saltwater into crates #493

Merged

Stupremee marked this pull request as draft August 17, 2020 00:24

Stupremee closed this Sep 8, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Add proper Repl #488

[WIP] Add proper Repl #488

Stupremee commented Jul 24, 2020 •

edited

Loading

jyn514 left a comment

jyn514 left a comment

jyn514 Jul 25, 2020

jyn514 Aug 3, 2020

jyn514 Aug 3, 2020

jyn514 Aug 3, 2020

jyn514 Aug 3, 2020

jyn514 Aug 4, 2020

jyn514 Aug 4, 2020

jyn514 Aug 4, 2020

Stupremee commented Sep 8, 2020

	id: saltwater::InternedStr::get_or_intern("execute"),
	id: "execute".into(),

		// FIXME: Currently doesn't work. Just make insert() pub?
		symbol: fun.insert(),

	const SCREAM: &[u8] = include_bytes!("../data/R2D2-Scream.ogg");
	const SCREAM: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "data/R2D2-Scream.ogg")));

	Type::Char(_) => execute!(fun, char, \|c\| println!("=> {}", c)),
	Type::Char(_) => execute!(fun, u8, \|c\| println!("=> {}", if c.is_ascii() { c as char } else { `hex::encode(&[c]) })),

[WIP] Add proper Repl #488

[WIP] Add proper Repl #488

Conversation

Stupremee commented Jul 24, 2020 • edited Loading

jyn514 left a comment

Choose a reason for hiding this comment

jyn514 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Stupremee commented Sep 8, 2020

Stupremee commented Jul 24, 2020 •

edited

Loading