880575 - Factor the JS shell's repl into a few functions

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Jason Orendorff [:jorendorff]]

Who knows, maybe if the code is readable enough someone will take bug 480198. :)

Comment 1

[Jason Orendorff [:jorendorff]]

Attachment: Part 1 - Factor out ReadEvalPrintLoop, v1

This comes in five patches, all of them pretty trivial.

Comment 2

[Jason Orendorff [:jorendorff]]

Attachment: Part 2 - Factor out RunFile, v1

Comment 3

[Jason Orendorff [:jorendorff]]

Attachment: Part 3 - Declare at initialization

Comment 4

[Jason Orendorff [:jorendorff]]

Attachment: Part 4 - Use a Vector<char> for the input buffer (instead of manual malloc/free)

Comment 5

[Jason Orendorff [:jorendorff]]

Attachment: Part 5 - Use CompileOptions, and Handles, and a few other changes

Comment 6

[Jeff Walden [:Waldo]]

Comment on attachment 759597 [details] [diff] [review]
Part 1 - Factor out ReadEvalPrintLoop, v1

Review of attachment 759597 [details] [diff] [review]:
-----------------------------------------------------------------

I don't care where the style nits get fixed in this patch stack, just fix them by the end.  :-)  I'm noting 'em as I see 'em.

::: js/src/shell/js.cpp
@@ +528,5 @@
>      free(buffer);
>      fprintf(gOutFile, "\n");
> +}
> +
> +class AutoCloseInputFile {

{ on new line.

@@ +533,5 @@
> +  private:
> +    FILE *f_;
> +  public:
> +    explicit AutoCloseInputFile(FILE *f) : f_(f) {}
> +    ~AutoCloseInputFile() { if (f_ && f_ != stdin) fclose(f_); }

I'd rather see this in multiple lines, honestly.

@@ +566,5 @@
> +         * hack, and gobble the first line if it starts with '#'.
> +         */
> +        int ch = fgetc(file);
> +        if (ch == '#') {
> +            while((ch = fgetc(file)) != EOF) {

Space after while.

Comment 7

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/df75bae8a436
https://hg.mozilla.org/mozilla-central/rev/42975d6638db
https://hg.mozilla.org/mozilla-central/rev/d496b277486d
https://hg.mozilla.org/mozilla-central/rev/abeb26888062
https://hg.mozilla.org/mozilla-central/rev/efe5d05176dc