gloss 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efa5107f463e2776911f8897141a352305c964561f4d64f5002d21ad2f3e25cf
-  data.tar.gz: 0c65ac9ffd1a26ebd10c9e68eeb31e754c19fb22e9afb652e3a659c51b844217
+  metadata.gz: d0bcae87434234732f58cc6d0bb9a1408a72fae1f51b9fe0c1dcf86249784fe2
+  data.tar.gz: d3db73f4c6e907a0b11eaba71f4428680372b56df1e3e6d8df973e80c8346e26
 SHA512:
-  metadata.gz: 48e4df3d238b7b322baff5b7a30ceb037fb0bc2a067ee4318a1e3876f876d2e0a3bdf82e779295c6f76239c0c92f9e7b5e7eab8242384b4a052f610a866e2f15
-  data.tar.gz: c456de971b4ffed42a5a67dbc628dd6bdc793c9eb97a50e9bfc85433121ab634e35b920af8fd4adc64d20f7e600f7628f51179b54cc2f080c163b8688bfbc954
+  metadata.gz: d58d4583ec2c703c023741bc6fd211fd146d81e3e90b3c882b5c4e37aa4cb12de2ad8cf46f6c26a7bf392cfd6accc1372cbaa01be8eb763468918d0a60d05eba
+  data.tar.gz: ab6244066db5797def1d7225598c87e5bd9cde3385b303854e176332a96c16f8fbbe6f4a531dadb6fe6e22e9d860152daab4b5d4282af79646f7421ce4cde0e3

data/.github/workflows/crystal.yml

@@ -0,0 +1,26 @@
+name: Crystal CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+defaults:
+  run:
+    working-directory: ext/gloss
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    container:
+      image: crystallang/crystal
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install dependencies
+      run: shards install
+    - name: Run tests
+      run: crystal spec

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
+      with:
+        ruby-version: 2.7
+    - name: Install dependencies
+      run: bundle install
+    - name: Run tests
+      run: bundle exec rake build && bundle exec rake spec

data/.gitignore

@@ -1,5 +1,6 @@
-*.bundle
+*.bundle*
 *.o
 ext/.shards/
 tmp/
 *.log
+pkg/

data/Gemfile

@@ -1,3 +1,2 @@
 source "https://rubygems.org"
 gemspec
-gem "rbs", git: "git@github.com:duderman/rbs.git", branch: "file-open-block"

data/Gemfile.lock

@@ -1,16 +1,10 @@
-GIT
-  remote: git@github.com:duderman/rbs.git
-  revision: cb347ab605c6409d5ad38ba7439b170ed5996fae
-  branch: file-open-block
-  specs:
-    rbs (1.0.0)
-
 PATH
   remote: .
   specs:
-    gloss (0.0.1)
+    gloss (0.0.2)
       fast_blank
       listen
+      rbs
       steep
 
 GEM
@@ -32,10 +26,10 @@ GEM
     diff-lcs (1.4.4)
     fast_blank (1.0.0)
     ffi (1.14.2)
-    i18n (1.8.5)
+    i18n (1.8.6)
       concurrent-ruby (~> 1.0)
     language_server-protocol (3.15.0.1)
-    listen (3.3.3)
+    listen (3.4.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (1.0.0)
@@ -56,6 +50,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rbs (1.0.0)
     regexp_parser (2.0.0)
     rexml (3.2.4)
     rspec (3.10.0)
@@ -104,7 +99,6 @@ DEPENDENCIES
   gloss!
   pry-byebug
   rake-compiler
-  rbs!
   rspec
   rubocop
 

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Joseph Johansen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,6 +1,6 @@
 # Gloss
 
-Gloss is a high-level programming language based on [Ruby](https://github.com/ruby/ruby) and [Crystal](https://github.com/crystal-lang/crystal), which compiles to ruby; its aims are on transparency,
+[Gloss](https://en.wikipedia.org/wiki/Gloss_(annotation)) is a high-level programming language based on [Ruby](https://github.com/ruby/ruby) and [Crystal](https://github.com/crystal-lang/crystal), which compiles to ruby; its aims are on transparency,
 efficiency, and to enhance ruby's goal of developer happiness and productivity. Some of the features include:
 
 - Type checking, via optional type annotations
@@ -38,7 +38,7 @@ result.length # OK => 11
 #### Macros:
 
 ```crystal
-# src/lib/http_client.gloss
+# src/lib/http_client.gl
 
 class HttpClient
 
@@ -119,6 +119,8 @@ class Language
     puts "my favourite language is #{language}"
   end
 end
+
+Language.new.favourite_language(Language::Lang::R)
 ```
 
 #### Tuples + Named Tuples:
@@ -183,6 +185,25 @@ when String
 end
 ```
 
+#### Abstract classes (roadmap)
+
+```crystal
+abstract class BaseClass
+  attr_reader :var
+  
+  def initialize(@var); end
+end
+
+class Child < BaseClass
+  def what_is_var
+    "var is #{var}"
+  end
+end
+
+BaseClass.new(123) # Error - can't instantiate abstract class
+Child.new(123).what_is_var # Ok - "var is 123"
+```
+
 ## Usage:
 
 ```ruby

data/Rakefile

@@ -17,4 +17,8 @@ RSpec::Core::RakeTask.new :spec  do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
 end
 
+task :build do
+  `cd ext/gloss && make && cd -`
+end
+
 task :default => [:spec]

data/ext/gloss/Makefile

@@ -1,15 +1,37 @@
 CRYSTAL = crystal
-TARGET = ../../lib/gloss.bundle
+TARGET = ../../lib/gls
 
+PLATFORM = $(shell uname -s)
+
+ifeq "$(PLATFORM)" "Darwin"
+install: all
+
+all: clean shards build
+
+shards:
+	shards
+
+build: ./src/gloss.cr
+	$(CRYSTAL) build  --link-flags "-dynamic -bundle -Wl,-undefined,dynamic_lookup" $< -o $(TARGET).bundle
+
+clean:
+	rm -f $(TARGET).bundle
+	rm -f $(TARGET).bundle.dwarf
+endif
+
+ifeq "$(PLATFORM)" "Linux"
+LLVM_TARGET = "$(shell uname -m)-unknown-linux-gnu"
 install: all
 
-all: clean shards $(TARGET)
+all: clean shards build
 
 shards:
 	shards
 
-$(TARGET): ./src/gloss.cr
-	$(CRYSTAL) build --link-flags "-dynamic -bundle -Wl,-undefined,dynamic_lookup" $< -o $(TARGET)
+build: ./src/gloss.cr
+	$(CRYSTAL) build $< --cross-compile --target $(LLVM_TARGET) --link-flags "-dynamic -bundle -Wl,-undefined,dynamic_lookup" -o $(TARGET)
 
 clean:
-	rm -f ../../**/*.bundle*
+	rm -f $(TARGET).o
+	rm -f $(TARGET).so
+endif

data/ext/gloss/extconf.rb

@@ -1,32 +1,10 @@
 require "mkmf"
-# $makefile_created = true
 find_executable("crystal") or abort <<~ERR
   You need crystal installed to use this gem.
   Please check out https://crystal-lang.org/ for information on how to install it.
 ERR
-# $LDFLAGS = "-rdynamic -L/usr/local/Cellar/crystal/0.35.1_1/embedded/lib -L/usr/local/lib -lpcre -lgc -lpthread /usr/local/Cellar/crystal/0.35.1_1/src/ext/libcrystal.a -L/usr/local/Cellar/libevent/2.1.12/lib -levent -liconv -ldl -Llib -lgloss"
-# $LDFLAGS << " -Wl,-undefined,dynamic_lookup -Llib -lgloss "
 
-create_makefile "gloss"
-# $(CRYSTAL) $< --link-flags "-dynamic -bundle -Wl,-undefined,dynamic_lookup" -o $(TARGET)
-
-# I feel like a bad person
-# File.open(File.join(__dir__, "Makefile"), "w") do |f|
-#   f.write <<~MAKEFILE
-#     CRYSTAL = crystal
-#     TARGET = ../../lib/gloss.bundle
-
-#     install: all
-
-#     all: clean shards $(TARGET)
+# patch it to be no-op
+def create_makefile(_, _ = nil); end
 
-#     shards:
-#       shards
-
-#     $(TARGET): ./src/gloss.cr
-#       $(CRYSTAL) build --link-flags "-dynamic -bundle -Wl,-undefined,dynamic_lookup" $< -o $(TARGET)
-
-#     clean:
-#       rm -f ../../**/*.bundle*
-#   MAKEFILE
-# end
+create_makefile "gloss"

data/ext/gloss/spec/parser_spec.cr

@@ -0,0 +1,91 @@
+require "./spec_helper"
+
+module Gloss
+  describe Parser do
+    it "allows single quoted strings" do
+      Gloss.parse_string("puts 'hello world'").should be_truthy
+    end
+
+    it "doesn't require 'of' after empty arrays" do
+      Gloss.parse_string("arr = []").should eq(
+        %q|{"type":"Assign","op":null,"target":{"type":"Var","name":"arr"},"value":{"type":"ArrayLiteral","elements":[],"frozen":false}}|
+      )
+    end
+
+    it "doesn't require 'of' after empty hashes" do
+      Gloss.parse_string("hsh = {}").should be_truthy
+    end
+
+    it "parses all kinds of method args" do
+      output = %q|{"type":"DefNode","name":"abc","body":null,"rp_args":[{"type":"Arg","name":"a","external_name":"a","default_value":null,"restriction":{"type":"Path","value":"Float"},"keyword_arg":false},{"type":"Arg","name":"b","external_name":"b","default_value":null,"restriction":null,"keyword_arg":false},{"type":"Arg","name":"c","external_name":"c","default_value":null,"restriction":null,"keyword_arg":false,splat: "true"},{"type":"Arg","name":"d","external_name":"d","default_value":{"type":"LiteralNode","value":"nil","rb_type":"NilClass"},"restriction":{"type":"Union","types":[{"type":"Path","value":"String"},{"type":"Path","value":"Nil"}]},"keyword_arg":false},{"type":"Arg","name":"e","external_name":"e","default_value":null,"restriction":{"type":"Path","value":"Integer"},"keyword_arg":true},{"type":"Arg","name":"f","external_name":"f","default_value":null,"restriction":null,"keyword_arg":true},{"type":"Arg","name":"g","external_name":"g","default_value":{"type":"LiteralNode","value":"nil","rb_type":"NilClass"},"restriction":{"type":"Path","value":"String"},"keyword_arg":true}],"receiver":null,"return_type":null,"rest_kw_args":{"type":"Arg","name":"h","external_name":"h","default_value":null,"restriction":null,"keyword_arg":false}}|
+      Gloss.parse_string(<<-GLS).should eq output
+        def abc(a : Float, b, *c, d : String? = nil, e: : Integer, f:, g: : String = nil, **h)
+        end
+      GLS
+    end
+
+    it "parses rescue with ruby syntax" do
+      Gloss.parse_string(<<-GLOSS).should be_truthy
+        begin
+          raise "Abc"
+        rescue RuntimeError => e
+          p e.message
+        rescue NoMethodError
+        rescue => e
+        end
+      GLOSS
+    end
+  end
+
+  it "parses shorthand blocks with ruby syntax" do
+    Gloss.parse_string("[1].map(&:to_s)").should eq(
+      %q<{"type":"Call","name":"map","args":[],"object":{"type":"ArrayLiteral","elements":[{"type":"LiteralNode","value":"1","rb_type":"Integer"}],"frozen":false},"block":null,"block_arg":{"type":"LiteralNode","value":":to_s","rb_type":"Symbol"}}>
+    )
+  end
+
+  it "parses tuples as frozen arrays" do
+    Gloss.parse_string("{ 'hello', 'world' }").should eq(
+      %q<{"type":"ArrayLiteral","elements":[{"type":"LiteralNode","value":"\"hello\"","rb_type":"String"},{"type":"LiteralNode","value":"\"world\"","rb_type":"String"}],"frozen":true}>
+    )
+  end
+
+  it "parses named tuples as frozen hashes" do
+    Gloss.parse_string("{ hello: 'world' }").should eq(
+      %q<{"type":"HashLiteral","elements":[["hello",{"type":"LiteralNode","value":"\"world\"","rb_type":"String"}]],"frozen":true}>
+    )
+  end
+
+  it "parses the and operator" do
+    Gloss.parse_string("puts 'hello world' if 1 and 2").should be_truthy
+  end
+
+  it "parses the or operator" do
+    Gloss.parse_string("puts 'hello world' if true or false").should be_truthy
+  end
+
+  it "parses the not operator" do
+    Gloss.parse_string("puts 'hello world' if true and not false").should be_truthy
+  end
+
+  it "parses global variables" do
+    Gloss.parse_string("$var : String = 'hello world'").should eq(
+      %q|{"type":"TypeDeclaration","var":{"type":"GlobalVar","name":"$var"},"declared_type":{"type":"Path","value":"String"},"value":{"type":"LiteralNode","value":"\"hello world\"","rb_type":"String"},"var_type":"GlobalVar"}|
+    )
+  end
+
+  it "parses for loops" do
+    Gloss.parse_string(<<-GLS).should be_truthy
+      for k, v in { hello: world }
+        puts key: k, value: v
+      end
+    GLS
+  end
+
+  it "parses generics as RBS generics" do
+    expected =
+      %q|{"type":"TypeDeclaration","var":{"type":"Var","name":"hsh"},"declared_type":{"type":"Generic","name":{"type":"Path","value":"Hash"},"args":[{"type":"Path","value":"String"},{"type":"Path","value":"String"}]},"value":{"type":"HashLiteral","elements":[[{"type":"LiteralNode","value":"\"hello\"","rb_type":"String"},{"type":"LiteralNode","value":"\"world\"","rb_type":"String"}]],"frozen":false},"var_type":"Var"}|
+    Gloss.parse_string(<<-GLS).should eq expected
+      hsh : Hash[String, String] = { "hello" => "world" }
+    GLS
+  end
+end

data/ext/gloss/spec/spec_helper.cr

@@ -0,0 +1,2 @@
+require "spec"
+require "../src/parser"

data/ext/gloss/src/cr_ast.cr

@@ -1,5 +1,6 @@
 require "compiler/crystal/syntax/*"
 require "json"
+require "./rb_ast"
 
 module Crystal
   abstract class ASTNode
@@ -139,17 +140,18 @@ module Crystal
     end
   end
 
-  class NamedArgument < ASTNode
+  class Arg < ASTNode
+    property keyword_arg : Bool = false
+
     def to_rb
-      Rb::AST::EmptyNode.new(self.class.name)
+      Rb::AST::Arg.new(@name, @external_name, @restriction.try(&.to_rb),
+                       @default_value.try(&.to_rb), @keyword_arg)
     end
   end
 
-  class Arg < ASTNode
-    property keyword_arg : Bool = false
-
+  class NamedArgument < ASTNode
     def to_rb
-      Rb::AST::Arg.new(@name, @external_name, @restriction.try(&.to_rb), @default_value.try(&.to_rb))
+      Rb::AST::EmptyNode.new(self.class.name)
     end
   end
 
@@ -197,7 +199,7 @@ module Crystal
 
   class Global < ASTNode
     def to_rb
-      Rb::AST::EmptyNode.new(self.class.name)
+      Rb::AST::GlobalVar.new(@name)
     end
   end
 
@@ -359,9 +361,21 @@ module Crystal
     end
   end
 
+  class Union < ASTNode
+    def to_rb
+      Rb::AST::Union.new(@types.map(&.to_rb))
+    end
+  end
+
+  class Generic < ASTNode
+    def to_rb
+      Rb::AST::Generic.new(@name.to_rb, @type_vars.map(&.to_rb))
+    end
+  end
+
   {% for class_name in %w[ProcNotation Macro OffsetOf VisibilityModifier IsA RespondsTo
-                         Select ImplicitObj AnnotationDef While Until Generic UninitializedVar
-                         ProcLiteral ProcPointer Union Self Yield Include
+                         Select ImplicitObj AnnotationDef While Until UninitializedVar
+                         ProcLiteral ProcPointer Self Yield Include
                          Extend LibDef FunDef TypeDef CStructOrUnionDef ExternalVar Alias
                          Metaclass Cast NilableCast TypeOf Annotation
                          Underscore MagicConstant Asm AsmOperand] %}