Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve onboarding #514

Closed
wants to merge 5 commits into from
Closed

Improve onboarding #514

wants to merge 5 commits into from

Conversation

ekipan
Copy link
Contributor

@ekipan ekipan commented Feb 3, 2023

I wrote a few comments and moved a few things to help me as I start to read the source. Forgive my rudeness but I have no build environment, these changes are untested. The hope is that they're trivial enough to be without error, or at least easy enough to fix.

If you find them useful.

Some of the .asm word list comments were out of date
anyway, so I moved them into durexforth.asm, making
it a single searchable index for the whole dictionary.
@ekipan
Copy link
Contributor Author

ekipan commented Feb 3, 2023

Actually please don't merge yet. f449cf9 is still a bit hairy to my liking.

I've never submitted a pull request before, I assume it'll track my master if I rebase and force push? It'll be a couple hours before I get home though.

@jkotlinski
Copy link
Owner

jkotlinski commented Feb 3, 2023 via email

@ekipan
Copy link
Contributor Author

ekipan commented Feb 3, 2023

I'm happy with the log. Please review.

@jkotlinski
Copy link
Owner

For some reason, the build does not pass with these changes. Any idea what might cause it?

@ekipan
Copy link
Contributor Author

ekipan commented Feb 3, 2023

Looks like it ran out of cycles? I'm not sure why the rebased HEAD would if the old one didn't.

forth/base.fs Outdated Show resolved Hide resolved
@ekipan
Copy link
Contributor Author

ekipan commented Feb 3, 2023

I put the base.fs changes on a branch and rewound master, pardon me while I use your build system for my own testing. If this is unsuccessful I'll retract the PR for now until I get my own environment.

@ekipan
Copy link
Contributor Author

ekipan commented Feb 3, 2023

Strange. Did I introduce an infinite loop in the Forth code somehow? Would adding one more include consume another billion cycles? Was it a fluke?

Those changes are on extract-base. Shall I try a separate PR?

@jkotlinski
Copy link
Owner

Running out of cycles means, either the build or test process got stuck somewhere.
Oh well, for whatever reason it worked now again.
I will take a look at the changes in time :-)

@ekipan
Copy link
Contributor Author

ekipan commented Feb 3, 2023

Sorry about that, shiny button was there, wanted me to push it. It's back to where the test passed, without my extra merge commit.

asm/compiler.asm Outdated Show resolved Hide resolved
This reverts commit 0eee383.

# Conflicts:
#	asm/durexforth.asm
@jkotlinski
Copy link
Owner

jkotlinski commented Feb 4, 2023 via email

@ekipan
Copy link
Contributor Author

ekipan commented Feb 4, 2023

Could I suggest a blurb to the effect of "Start reading asm/durexforth.asm. It includes a dozen asm files that defines the builtin words, and then loads forth/base.fs and starts interpreting, defining the rest of the vocabulary." Maybe in README or CONTRIBUTING?

As a matter of preference, I'm not convinced that separate asm/ and forth/ directories buys anything. Personally I'd prefer a single src/ directory.

Edit: I wish I'd submitted this from a branch not named master. Oh well, if I want to experiment on my own it's not like the name master is special or anything.

@jkotlinski
Copy link
Owner

jkotlinski commented Feb 4, 2023 via email

@jkotlinski
Copy link
Owner

FYI: I added #515

Thank you for the idea!

@ekipan
Copy link
Contributor Author

ekipan commented Feb 4, 2023

Oh I use some Scintilla thing whose key binds grafted themselves onto my fingers years ago. I should probably learn a "real editor" but I feel like this kind of thing is mostly habit. Related to that: I have git configured autocrlf=false, and I noticed my clone of durexforth has mostly files with CR+LF in them. I usually prefer LF files. I think I noticed a couple anomalies? Git status kept telling me I changed random lines, perhaps someone else had edited the CRs out of them.

Incidentally, what do you think of 0eee383...8742ace? Maybe you'd prefer to keep the macros together but do you want the extra prose?

I'm closing this PR, gonna do some more surgery on my fork and don't want to spam your notifs.

@ekipan ekipan closed this Feb 4, 2023
@jkotlinski
Copy link
Owner

Umm... the .gitattributes file contains the line * text=auto, which I think means, text will be converted to LF automatically. You are right, it seems some files do not have normalized line endings. I am not sure how it came to be like that, or how to prevent it from happening again.

0eee383...8742ace <-- looks fine to me!

@ekipan
Copy link
Contributor Author

ekipan commented Feb 4, 2023

#516 made these changes stale, I redid them: ekipan:comments. If you'd like the prose I could make another PR.

@jkotlinski
Copy link
Owner

jkotlinski commented Feb 4, 2023 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants