Skip to content

Commit

Permalink
merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
jcubic committed Jan 16, 2025
2 parents 873cf5a + 5dffe9c commit 3ba0929
Show file tree
Hide file tree
Showing 46 changed files with 12,831 additions and 12,903 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dist/* binary
package-lock.json binary
assets/classDiagram.svg binary
assets/*.png binary
assets/*.gif binary
tests/snapshots/* binary
*.xcm binary
*.xcb binary
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
paths:
- "template/Makefile"
- "package.json"
- "package-lock.json"
- "Makefile"
- "scripts/*"
- "tests/*"
Expand Down Expand Up @@ -51,3 +53,9 @@ jobs:
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Code Climate
uses: paambaati/[email protected]
env:
CC_TEST_REPORTER_ID: ${{ secrets.CODE_CLIMATE }}
with:
debug: true
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
if: ${{ github.repository == 'jcubic/lips-website' || (github.repository == 'LIPS-scheme/lips' && github.ref_name == 'master')}}
if: ${{ github.repository == 'jcubic/lips-website' || (github.repository == 'jcubic/lips' && github.ref_name == 'master')}}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/build
Expand Down
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.PHONY: publish test coveralls lint zero coverage codespell

VERSION=1.0.0-beta.19
VERSION_DASH=`echo -n "1.0.0-beta.19" | sed "s/-/%E2%80%93/"`
VERSION=1.0.0-beta.20
VERSION_DASH=`echo -n "1.0.0-beta.20" | sed "s/-/%E2%80%93/"`
BRANCH=`git branch | grep '^*' | sed 's/* //'`
DATE=`date -uR`
YEAR=`date +%Y`
Expand Down Expand Up @@ -39,7 +39,7 @@ define ver_date
-e "s/{{YEAR}}/${YEAR}/" $(1) || $(SED) -i -e "s/{{VER}}/DEV/g" -e "s/{{DATE}}/$(DATE)/g" $(1)
endef

ALL: Makefile package.json .$(VERSION) assets/classDiagram.svg dist/base.js dist/lips.js dist/lips.esm.js dist/lips.min.js dist/lips.esm.min.js README.md dist/std.min.scm dist/std.xcb docs/reference.json
ALL: Makefile package.json .$(VERSION) assets/classDiagram.svg dist/base.js dist/lips.js dist/lips.esm.js dist/lips.min.js dist/lips.esm.min.js README.md dist/std.min.scm dist/std.xcb docs/reference.json docs/version.json

dist/banner.js: src/banner.js src/lips.js .$(VERSION)
$(CP) src/banner.js dist/banner.js
Expand All @@ -49,6 +49,9 @@ dist/base.js: src/lips.js .$(VERSION)
$(SED) '/\/\*\*@license/,/\*\//d' < src/lips.js > dist/base.js
$(call ver_date,dist/base.js)

docs/version.json: ./docs/version.mjs .$(VERSION)
$(NODE) ./docs/version.mjs

dist/lips.js dist/lips.esm.js dist/lips.cjs: dist/banner.js dist/base.js .$(VERSION) rollup.config.js
$(ROLLUP) -c

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
alt="LIPS - Scheme Based Powerful Lisp Language" />
</h1>

[![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/lips_lang)](https://twitter.com/lips_lang)
[![npm](https://img.shields.io/badge/npm-1.0.0%E2%80%93beta.19-blue.svg)](https://www.npmjs.com/package/@jcubic/lips)
[![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/LIPS_scheme)](https://twitter.com/LIPS_scheme)
[![npm](https://img.shields.io/badge/npm-1.0.0%E2%80%93beta.20-blue.svg)](https://www.npmjs.com/package/@jcubic/lips)
![1.0.0 Complete](https://img.shields.io/github/milestones/progress-percent/jcubic/lips/1?label=1.0.0%20Complete)
[![Build and test](https://github.com/jcubic/lips/actions/workflows/build.yaml/badge.svg?branch=devel&event=push)](https://github.com/jcubic/lips/actions/workflows/build.yaml)
[![Coverage Status](https://coveralls.io/repos/github/jcubic/lips/badge.svg?branch=devel&14cd9517f1571623398790dede918e37)](https://coveralls.io/github/jcubic/lips?branch=devel)
Expand Down
Binary file modified assets/Interpreter.dia
Binary file not shown.
369 changes: 217 additions & 152 deletions assets/Interpreter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screencast.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 3 additions & 4 deletions bin/lips.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@ import {
nil,
Pair,
env,
banner,
InputPort,
OutputPort
} from '../src/lips.js';
import { version, date } from '../dist/lips.esm.js';
import { version, date, banner } from '../dist/lips.esm.js';

import fs from 'fs';
import os from 'os';
Expand Down Expand Up @@ -406,7 +405,7 @@ if (options.version || options.V) {
}
} else if (options.h || options.help) {
var name = process.argv[1];
var intro = banner.replace(/(Jankiewicz\n)[\s\S]+$/, '$1').replace('{{VER}}', version);
var intro = banner.replace(/(Jankiewicz\n)[\s\S]+$/, '$1');
console.log(format('%s\nusage:\n %s -q | -c | -h | -t | -b <file> | -d | -e <code> | <filename>\n' +
'\n [-h --help]\t\tthis help message\n [-e --eval]\t\texecute code\n [-V --v' +
'ersion]\tdisplay version information according to srfi-176\n [-c --compile]\t' +
Expand All @@ -422,7 +421,7 @@ if (options.version || options.V) {
const dynamic = options.d || options.dynamic;
const entry = ' ' + (dynamic ? 'dynamic' : 'lexical') + ' scope $1';
if (process.stdin.isTTY && !quiet) {
console.log(banner.replace(/(\n\nLIPS.+)/m, entry)); // '
console.log(banner.replace(/(\n\nLIPS.+)/m, entry));
}
var prompt = 'lips> ';
var continue_prompt = '... ';
Expand Down
Loading

0 comments on commit 3ba0929

Please sign in to comment.