pycplus 0.1.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5de94922fe2d48ec056ce74840f504963188d6cd6346d65e9c7396639087d8a0
-  data.tar.gz: 4bb5265be59880acaf12d0adc1d38e563f2f9b737dd99f0881f985529b6d498d
+  metadata.gz: 2fde7222ccd4137c44659d5df46a12bc2cb57facbb373c129d54af19596aeb93
+  data.tar.gz: b86597ee3514507775c3a2be65e9fd8ed1f2778be48d276b45b99898e0ba8223
 SHA512:
-  metadata.gz: eed4ab911e3f18860ec2c5975b7b731d3ee93974af681b8d1f2e5f81a10430ca6b75436700e4c542fea7e04c65764ad761c4032c8fe32493342356a73ac10971
-  data.tar.gz: 459c3eff8977e4e485611db5a77f7d4528316cce6d37e82d1fdc07fd5be8bfdc4347d2354b403fdf966ece64bf7d8d2e5cb6f3683e17a152e16d1b3dc5690fb8
+  metadata.gz: 1437d02dc107e13a85893882db8d325e42d46e62783eeb27c7c58cbf4ce08bc844103e011084a36686ed465fac755bb3e45f96b274e9df4788637fd64ae33bfc
+  data.tar.gz: 03faa5bad0cd3ca3242d64e236995baa1d03337d68fe013d3152e6f2a82d74919c8311cd2d1c1361486a8ff55515134d7cd7c0e3be9931b9f72533160f6adb74

data/README.md

@@ -1,93 +1,3 @@
 # TDP019
 
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://gitlab.liu.se/andjo858-ip/tdp019.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://gitlab.liu.se/andjo858-ip/tdp019/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+TODO

data/bin/pycplus

@@ -1,26 +1,65 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require_relative '../lib/lang.rb'
+require 'optparse'
+require_relative '../lib/pcpparse'
 
 
-if ARGV.empty?
-    puts "No arguments provided."
-else
-    arg = ARGV[0]
+# Method to print gem version
+def print_version
+    spec = Gem::Specification.load('../pycplus.gemspec')
+    puts "#{spec.name} version #{spec.version}"
+end
+
+def main
+    # Parse other command-line options using OptionParser
+    options = {}
+    OptionParser.new do |opts|
+
+        opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} [options] filename"
+
+        # version is handled as a special case as it doesn't make sense to use it alongside the other options
+        opts.on("-v", "--version", "Display version information") do
+            print_version
+            exit
+        end
+
+        opts.on("-d", "--debug", "Enable debug mode") do
+            options[:debug] = true
+            print("dhsdhshdshds")
+        end
+    end.parse!
 
-    @lang_parser = MyLang.new
+    # Check if a filename argument is provided
+    if ARGV.empty?
+        puts "Error: No filename or arguments provided."
+        exit 1
+    end
+
+    filename = ARGV.shift
+    @lang_parser = Pycplus.new
 
-    if File.file?(arg)
-        extension = File.extname(arg)
+    # Enable debug mode if specified
+    if options[:debug]
+        @lang_parser.log(true)
+    else
+        @lang_parser.log(false)
+    end
+
+    if File.file?(filename)
+        extension = File.extname(filename)
 
         if extension == ".pcp"
-            @lang_parser.log(false)
-            @lang_parser.parse_file(arg)
+            @lang_parser.parse_file(filename)
         else
-            puts "File is not a .pcp file, make sure to use the correct extension."
+            puts "Error: File is not a .pcp file. Please provide a file with the correct extension."
         end
     else
-        puts "Unable to find file #{arg}"
+        puts "Error: Unable to find file #{filename}"
     end
 end
+
+
+if __FILE__ == $PROGRAM_NAME
+    main
+end

data/lib/STL.rb

@@ -1,12 +1,60 @@
-def print(x)
-  pp x
-end
 
-module ArrayFunctions
-  def self.pop()
-    pop
+module STL
+  def self.print(x)
+    pp x
+    return nil
+  end
+
+  def self.size(array)
+    unless array.is_a?(Array)
+      raise TypeError, "Function #{__method__} must be used on an array."
+    end
+    
+    return array.count
+  end
+
+  def self.pop(array)
+    unless array.is_a?(Array)
+      raise TypeError, "Function #{__method__} must be used on an array."
+    end
+    if array.empty?
+      raise IndexError, "Can not use pop on an empty array."
+    end
+    pop_element = array.last
+    array.delete_at(-1)
+    return pop_element
+  end
+
+  def self.push(array, element)
+    unless array.is_a?(Array)
+      raise TypeError, "Function #{__method__} must be used on an array."
+    end
+    array << element
+    return array
+  end
+
+  def self.get_element(array, index)
+    unless array.is_a?(Array)
+      raise TypeError, "Function #{__method__} must be used on an array."
+    end
+    unless index.between?(0, array.size-1)
+      raise IndexError, "Index out of bounds. Max index: #{array.size-1}."
+    end
+
+    element = array[index]
+    return element
   end
 
-  def self.push()
+  def self.delete_element(array, index)
+    unless array.is_a?(Array)
+      raise TypeError, "Function #{__method__} must be used on an array."
+    end
+    unless index.between?(0, array.size-1)
+      raise IndexError, "Index out of bounds. Max index: #{array.size-1}."
+    end
+
+    element = array[index]
+    array.delete_at(index)
+    return element
   end
-end
+end

data/lib/nodes.rb

@@ -3,80 +3,56 @@
 require_relative 'STL.rb'
 
 class Scope
-  attr_reader :variables, :functions
+  attr_reader :identifiers,:parent_scope
   def initialize(parent_scope = nil)
-    @variables = {}
-    @functions = {}
+    @identifiers = {}
     @parent_scope = parent_scope
   end
 
   def set_variable(name, op, expression)
-    case op
-    when '='
-      @variables[name] = expression
-    when '+='
-      @variables[name] += expression
-    when '-='
-      @variables[name] -= expression
-    end
-
-    return unless @parent_scope
-    
-    variable_scope = @parent_scope.get_scope(name, :variables)
-    
-    if variable_scope      
-      variable_scope.set_variable(name, op, expression)
+    if op == '='
+      @identifiers[name] = expression
+    else
+      id_scope = get_scope(name)
+      @identifiers[name] = get_identifier(name) if id_scope
+      if op == '+='
+        @identifiers[name] = 0 if !id_scope
+        @identifiers[name] += expression
+      else
+        @identifiers[name] = 0 if !id_scope
+        @identifiers[name] -= expression
+      end
     end
   end
 
-  def get_identifier(name, id_type)
-    scope = get_scope(name, id_type)
+  def get_identifier(name)
+    scope = get_scope(name)
     if scope
-      return scope.instance_variable_get("@#{id_type}")[name]
+      return scope.identifiers[name]
     else
-      raise "[#{id_type}] #{name} not found."
+      raise NameError,"Identifier #{name} not defined."
     end
   end
 
-  def get_scope(name, id_type)
-    if instance_variable_get("@#{id_type}").has_key?(name)
+  def get_scope(name)
+    if @identifiers.has_key?(name)
       return self
     elsif @parent_scope
-      return @parent_scope.get_scope(name, id_type)
+      return @parent_scope.get_scope(name)
     end
   end
 
+  def is_function?(name)
+    scope = get_scope(name)
+    id_value = scope.get_identifier(name) if scope
+    return id_value.is_a?(Hash) 
+  end
+
   def set_function(name, block, parameters)
-    @functions[name] = {:parameters => parameters, :block => block}
-    if @parent_scope
-      function_scope = @parent_scope.get_scope(name, :functions)
-    end
-    if function_scope
-      function_scope.set_function(name, block, parameters)
-    end
+    @identifiers[name] = {:parameters => parameters, :block => block}
   end
-  
-  # def initialize_STL
-  #   return unless defined?(STL)
-  #   # STL.methods(false).each do |name|
-  #   #   method_object = STL.method(name)
-  #   #   @functions[name] = {:parameters => method_object.parameters.flatten[1..-1], :block => method_object}
-  #   # end
-  #   STL.singleton_methods(false).each do |name|
-  #     method_object = STL.method(name)
-  #     parameters = method_object.parameters.map { |type, name| name }.compact
-  #     @functions[name] = { parameters: parameters, block: method_object }
-  #   end
-
-  #   STL.instance_methods(false).each do |name|
-  #     method_object = STL.instance_method(name)
-  #     parameters = method_object.parameters.map { |type, name| name }.compact
-  #     @functions[name] = { parameters: parameters, block: method_object }
-  #   end
-  # end
 end
 
-
 class BlockNode
   def initialize(statements = nil)
     @block = statements
@@ -84,10 +60,12 @@ class BlockNode
 
   def evaluate(scope)
     return unless @block
+    result = nil
     @block.each do |statement|
       result = statement.evaluate(scope)
       return result if result.is_a?(ReturnValue)
     end
+    return result
   end
 end
 
@@ -105,25 +83,27 @@ class FunctiondefNode
 end
 
 class FunctioncallNode
-  def initialize(identifier, arguments = [])
+  include STL
+  def initialize(identifier, object = nil, arguments = [])
     @identifier = identifier.value
     @arguments = arguments
+    @object = object
   end
 
   def validate_arguments(parameters)
     if @arguments.size != parameters.size
-      raise "Wrong number of arguments (given: #{@arguments.size} expected: #{parameters.size})."
+      raise ArgumentError, "Wrong number of arguments (given: #{@arguments.size} expected: #{parameters.size})."
     end
   end
 
-  def evaluate_method(method, scope)
+  def evaluate_method(scope)
     args = @arguments.map {|arg| arg.evaluate(scope)}
-    method.call(*args)
+    result = STL.send(@identifier, *args)
+    return result
   end
 
   def evaluate_block(parameters, block, scope)
     new_scope = Scope.new(scope)
-
     parameters.zip(@arguments).each do |parameter, argument|
       new_scope.set_variable(parameter, '=', argument.evaluate(scope))
     end
@@ -133,18 +113,25 @@ class FunctioncallNode
   end
 
   def evaluate(scope)
-    function_scope = scope.get_scope(@identifier, :functions)
-    if !function_scope
-      if self.respond_to?(@identifier, true)
-        method_object = method(@identifier)
-        parameters = method_object.parameters.map {|type, name| name}.compact
+
+    id_scope = scope.get_scope(@identifier)
+    if id_scope && !id_scope.is_function?(@identifier)
+      raise TypeError, "Identifier #{@identifier} is not defined as a function."
+    end
+    if @object
+      @arguments.unshift(@object)
+    end
+    if !id_scope
+      if STL.respond_to?(@identifier)
+        method = STL.method(@identifier)
+        parameters = method.parameters
         validate_arguments(parameters)
-        evaluate_method(method_object, scope)
+        evaluate_method(scope)
       else
-        raise "Function #{@identifier} not found."
+        raise NameError, "Function #{@identifier} not defined."
       end
     else
-      function = function_scope.get_identifier(@identifier, :functions)
+      function = id_scope.get_identifier(@identifier)
       parameters = function[:parameters]
       block = function[:block]
       validate_arguments(parameters)
@@ -154,19 +141,19 @@ class FunctioncallNode
 end
 
 class ProgramNode
+  attr_reader :statements
   def initialize(statements)
     @statements = statements
   end
 
   def evaluate
     global_scope = Scope.new
-    # global_scope.initialize_STL
-    
+    result = nil
     @statements.each do |statement|
       result = statement.evaluate(global_scope)
       return result.value if statement.is_a?(ReturnNode)
     end
-    return
+    return result
   end
 end
 
@@ -187,7 +174,6 @@ class ReturnNode
   end
 end
 
-
 class BinaryexpressionNode
   def initialize(lhs, op, rhs)
     @lhs = lhs
@@ -196,7 +182,11 @@ class BinaryexpressionNode
   end
 
   def evaluate(scope)
-    return @lhs.evaluate(scope).send(@op, @rhs.evaluate(scope))
+    rhs_value = @rhs.evaluate(scope)
+    if @op == :fdiv && rhs_value == 0
+      raise ZeroDivisionError,"Division by 0 not possible."
+    end
+    return @lhs.evaluate(scope).send(@op, rhs_value)
   end
 end
 
@@ -254,38 +244,21 @@ end
 class WhileNode < ControlflowNode
   def evaluate(scope)
     while @expression.evaluate(scope)
-      result = @block.evaluate(scope)
+      @block.evaluate(scope)
     end
   end
 end
 
-
-# Unsure about implementation, will check with project assistant
 class ArrayNode
   def initialize(elements = [])
     @elements = elements
-    @data_container = {}
-  end
-
-  def evaluate(scope)
-    @elements.each_with_index do |element, index|
-      @data_container[index] = element.evaluate(scope) 
-    end
-  end
-end
-
-
-# Not implemented yet
-class StringNode
-  def initialize(chars = [])
-    @chars = chars
   end
 
   def evaluate(scope)
+    return @elements.map {|element| element.evaluate(scope)}
   end
 end
 
-
 class PrimitiveNode
   attr_reader :value
   def initialize(value)
@@ -299,7 +272,11 @@ end
 
 class IdentifierNode < PrimitiveNode
   def evaluate(scope)
-    return scope.get_identifier(@value, :variables)
+    if scope.is_function?(@value)
+      raise SyntaxError, "Identifier #{@value} is assigned to a function. Please use correct syntax for function call."
+    else
+      return scope.get_identifier(@value)
+    end
   end
 end
 

data/lib/{lang.rb → pcpparse.rb}

@@ -3,17 +3,20 @@
 require_relative 'rdparse.rb'
 require_relative 'nodes.rb'
 
-class MyLang
+class Pycplus
         
   def initialize
 
-    @lang_parser = Parser.new("lang parser") do
+    @pycplus_parser = Parser.new("Pycplus parser") do
+      token(/#[^#]*#/)
       token(/\n/)
-      # token(/\\/)
-      # token(/"/) {|m| m}
-      token(/"[^"]"/) {|m| m.chars}
       token(/\s+/)
-      token(/if/) {|m| m}
+      token(/if/) {:if}
+      token(/while/) {:while}
+      token(/def/) {:def}
+      token(/return/) {:return}
+      token(/false/) {|m| m}
+      token(/true/) {|m| m}
       token(/>=/) {|m| m}
       token(/<=/) {|m| m}
       token(/==/) {|m| m}
@@ -22,11 +25,6 @@ class MyLang
       token(/\-=/) {|m| m}
       token(/&&/) {|m| m}
       token(/\|\|/) {|m| m}
-      token(/true/) {|m| m}
-      token(/false/) {|m| m}
-      token(/return/) {|m| m}
-      token(/def/) {|m| m}
-      token(/while/) {|m| m}
       token(/\d+\.\d+/) {|m| m.to_f}
       token(/\d+/) {|m| m.to_i}
       token(/\w+/) {|m| m}
@@ -43,17 +41,18 @@ class MyLang
 
       rule :statement do
         match(:assignment, ';')
-        match(:function_def)
         match(:function_call, ';')
-        match(:return, ';')
+        match(:function_def)
+        match(:return_statement, ';')
         match(:if_statement)
         match(:while_statement)
+        match(:expression_statement)
       end
 
       rule :assignment do
-        match(:identifier, :assignment_OP, :container) {|a, b, c| AssignmentNode.new(a,b,c)}
+        # match(:identifier, :assignment_OP, :function_call) {|a, b, c| AssignmentNode.new(a,b,c)}
         match(:identifier, :assignment_OP, :logical_expr) {|a, b, c| AssignmentNode.new(a,b,c)}
-        match(:identifier, :assignment_OP, :function_call) {|a, b, c| AssignmentNode.new(a,b,c)}
+        match(:identifier, :assignment_OP, :array) {|a, b, c| AssignmentNode.new(a,b,c)}
       end
 
       rule :assignment_OP do
@@ -63,8 +62,8 @@ class MyLang
       end
 
       rule :function_def do
-        match('def', :identifier, '(', :parameters , ')', :block) {|_, a, _, b, _, c| FunctiondefNode.new(a,c,b)}
-        match('def', :identifier, '(', ')', :block) {|_, a, _, _, b| FunctiondefNode.new(a,b)}
+        match(:def, :identifier, '(', :parameters , ')', :block) {|_, a, _, b, _, c| FunctiondefNode.new(a,c,b)}
+        match(:def, :identifier, '(', ')', :block) {|_, a, _, _, b| FunctiondefNode.new(a,b)}
       end
 
       rule :parameters do
@@ -82,10 +81,17 @@ class MyLang
       end
 
       rule :function_call do
-        match(:identifier,'(', :arguments, ')') {|a, _, b, _| FunctioncallNode.new(a,b)}
+        match(:identifier,'(', :arguments, ')') {|a, _, b, _| FunctioncallNode.new(a,nil,b)}
         match(:identifier,'(', ')') {|a, _, _| FunctioncallNode.new(a)}
-        # match(:identifier, '.', :identifier,'(', :arguments, ')') {|a, _, b, _| FunctioncallNode.new(a,b)}
-        # match(:identifier, '.', :identifier,'(',')')
+        match(:function_call,'.',:identifier ,'(',')') {|a, _, b, _, _| FunctioncallNode.new(b, a)}
+        match(:function_call,'.',:identifier ,'(',:arguments,')') {|a, _, b, _, c, _| FunctioncallNode.new(b,a,c)}
+        match(:object,'.',:identifier ,'(',')') {|a, _, b, _, _| FunctioncallNode.new(b, a)}
+        match(:object,'.',:identifier ,'(',:arguments,')') {|a, _, b, _, c, _| FunctioncallNode.new(b,a,c)}
+      end
+
+      rule :object do
+        match(:array)
+        match(:atom)
       end
 
       rule :arguments do
@@ -95,20 +101,25 @@ class MyLang
 
       rule :argument do
         match(:logical_expr)
-        match(:function_call)
+        match(:array)
       end
 
-      rule :return do
-        match('return', :logical_expr) {|_, a| ReturnNode.new(a)}
-        match('return', :function_call) {|_, a| ReturnNode.new(a)}
+      rule :return_statement do
+        match(:return, :logical_expr) {|_, a| ReturnNode.new(a)}
+        match(:return, :array) {|_, a| ReturnNode.new(a)}
+        # match(:return, :function_call) {|_, a| ReturnNode.new(a)}
       end
 
       rule :while_statement do
-        match('while', '(', :logical_expr, ')', :block) {|_,_,a,_,b| WhileNode.new(a,b)}
+        match(:while, '(', :logical_expr, ')', :block) {|_,_,a,_,b| WhileNode.new(a,b)}
       end
 
       rule :if_statement do
-        match('if', '(', :logical_expr, ')', :block) {|_,_,a,_,b| IfNode.new(a,b)}
+        match(:if, '(', :logical_expr, ')', :block) {|_,_,a,_,b| IfNode.new(a,b)}
+      end
+
+      rule :expression_statement do
+        match(:logical_expr, ';')
       end
 
       rule :logical_expr do
@@ -153,7 +164,7 @@ class MyLang
       rule :multiplication_OP do
         match('%') {|a| a}
         match('*') {|a| a}
-        match('/') {|a| a}
+        match('/') {|_| :fdiv}
       end
 
       rule :power_expr do
@@ -173,21 +184,17 @@ class MyLang
       rule :unary_OP do
         match('!') {|a| a}
         match('-') {|a| a}
+        match('+') {|a| a}
       end
 
       rule :binary_operand do
+        match(:function_call)
         match(:bool)
         match(:digit)
-        match(:function_call)
         match(:identifier)
         match('(', :logical_expr, ')') {|_, a, _| a}
       end
 
-      rule :container do
-        match(:string)
-        match(:array)
-      end
-
       rule :array do
         match('[', :elements , ']') {|_, a, _| ArrayNode.new(a)}
         match('[', ']') {|_,_| ArrayNode.new()}
@@ -200,33 +207,18 @@ class MyLang
 
       rule :element do
         match(:logical_expr)
-        match(:container)
-      end
-
-      rule :string do
-        match('"', :chars, '"') {|_, a, _| StringNode.new(a)}
-        match('"', '"') {|_, _| StringNode.new()}
-      end
-
-      rule :chars do
-        match(:chars, :char) {|a , b| a << b}
-        match(:char) {|a| [a]}
+        match(:array)
       end
 
       rule :atom do
         match(:bool)
         match(:digit)
-        match(:char)
         match(:identifier)
       end
 
-      rule :char do
-        match(/./) {|a| CharNode.new(a)}
-      end
-
       rule :bool do
-        match('true') {|_| BoolNode.new(true)}
-        match('false') {|_| BoolNode.new(false)}
+        match('true') {|a| BoolNode.new(true)}
+        match('false') {|a| BoolNode.new(false)}
       end
 
       rule :digit do
@@ -235,7 +227,7 @@ class MyLang
       end
 
       rule :identifier do
-        match(/_?[a-zA-Z*]\w*/) {|a| IdentifierNode.new(a.to_sym)}
+        match(/[_a-zA-Z]+\w*/) {|a| IdentifierNode.new(a.to_sym)}
       end
     end
   end
@@ -243,23 +235,30 @@ class MyLang
   def parse_file(filename)
     file = File.open(filename)
     file_data = file.read
-    result = @lang_parser.parse(file_data)
-    return result.evaluate
+    result = @pycplus_parser.parse(file_data)
+    return result.evaluate if result
   end
 
-  def parse_string(str, display_output = false)
-    output = @lang_parser.parse(str)
+  def parse_string(str, return_tree = false, display_output = false)
+    output = @pycplus_parser.parse(str)
     if display_output
       puts "=> #{output}"
     end
-    return output.evaluate
+    if return_tree
+      return output
+    else
+      return output.evaluate if output
+    end
   end
 
   def log(state = true)
     if state
-      @lang_parser.logger.level = Logger::DEBUG
+      @pycplus_parser.logger.level = Logger::DEBUG
     else
-      @lang_parser.logger.level = Logger::WARN
+      @pycplus_parser.logger.level = Logger::WARN
     end
   end
-end
+end
+
+
+# _?[a-zA-Z*]\w*

data/lib/rdparse.rb

@@ -219,7 +219,7 @@ class Parser
   def rule(name,&block)
     @current_rule = Rule.new(name, self)
     @rules[name] = @current_rule
-    instance_eval &block # In practise, calls match 1..N times
+    instance_eval(&block) # In practise, calls match 1..N times
     @current_rule = nil
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pycplus
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Johannes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-01 00:00:00.000000000 Z
+date: 2024-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -31,8 +31,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.0
-description: This Ruby Gem provides a framework for creating and utilizing a domain-specific
-  language (DSL) developed as part of a school project at LiU (Linköping University).
+description: This Ruby Gem provides a framework for creating and utilizing a programming
+  language developed as part of a school project at LiU (Linköping University).
 email: test@test.com
 executables:
 - pycplus
@@ -42,10 +42,9 @@ files:
 - README.md
 - bin/pycplus
 - lib/STL.rb
-- lib/lang.rb
 - lib/nodes.rb
+- lib/pcpparse.rb
 - lib/rdparse.rb
-- lib/test.rb
 homepage: https://rubygems.org/gems/pycplus
 licenses: []
 metadata: {}
@@ -67,5 +66,5 @@ requirements: []
 rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
-summary: A Ruby Gem for creating and using a domain-specific language (DSL)
+summary: A Ruby Gem for creating and using a programming language.
 test_files: []

data/lib/test.rb

@@ -1,161 +0,0 @@
-require_relative '../lib/lang.rb'
-require 'test/unit'
-
-class TestFaculty < Test::Unit::TestCase
-  def setup
-    @lang_parser = MyLang.new
-    @lang_parser.log(false)
-  end
-
-  # # Test for simple addition
-  # def test_addition_expr
-  #   assert_equal(1, @lang_parser.parse_string("return 0+1;"))
-  #   assert_equal(0, @lang_parser.parse_string("return -1+1;"))
-  #   assert_equal(-1, @lang_parser.parse_string("return -2+1;"))
-  # end
-
-  # # Test for simple subtraction
-  # def test_subtraction_expr
-  #   assert_equal(1, @lang_parser.parse_string("return 2-1;"))
-  #   assert_equal(0, @lang_parser.parse_string("return 1-1;"))
-  #   assert_equal(-1, @lang_parser.parse_string("return 1-2;"))
-  #   assert_equal(2, @lang_parser.parse_string("return 1--1;"))
-  # end
-
-  # # Test for simple multiplication
-  # def test_multiplication_expr
-  #   assert_equal(1, @lang_parser.parse_string("return 1*1;"))
-  #   assert_equal(0, @lang_parser.parse_string("return 0*1;"))
-  #   assert_equal(-1, @lang_parser.parse_string("return -1*1;"))
-  # end
-
-  # # Test for simple division
-  # def test_division_expr
-  #   assert_equal(1, @lang_parser.parse_string("return 1/1;"))
-  #   assert_equal(0, @lang_parser.parse_string("return 0/1;"))
-  #   assert_equal(-1, @lang_parser.parse_string("return -1/1;"))
-  # end
-
-  # # Test for simple modulo
-  # def test_modulo_expr
-  #   assert_equal(0, @lang_parser.parse_string("return 9%3;"))
-  #   assert_equal(1, @lang_parser.parse_string("return 5%2;"))
-  # end
-
-  # # Test for parentheses priority
-  # def test_parentheses_priority
-  #   assert_equal(3, @lang_parser.parse_string("return (3-2)*3;"))
-  #   assert_equal(7, @lang_parser.parse_string("return (3+4)*(6-2)/(2+2);"))
-  #   assert_equal(1, @lang_parser.parse_string("return (5-3)/(1*2);"))
-  # end
-
-  # # test for power expressions
-  # def test_power_expr
-  #   assert_equal(4, @lang_parser.parse_string("return 2^2;"))
-  #   assert_equal(8, @lang_parser.parse_string("return 2^2*2;"))
-  #   assert_equal(256, @lang_parser.parse_string("return 2^2^3;"))
-  # end
-
-  # # Test for variable names
-  # def test_variable_names
-  #   assert_equal(1, @lang_parser.parse_string("a = 1; return a;"))
-  #   assert_equal(1, @lang_parser.parse_string("_a = 1; return _a;"))
-  #   assert_equal(1, @lang_parser.parse_string("A131 = 1; return A131;"))
-    
-  #   # Forbidden variable names throws parsing error
-  #   assert_raises Parser::ParseError do
-  #     @lang_parser.parse_string("1a = 1;")
-  #   end
-  #   assert_raises Parser::ParseError do
-  #     @lang_parser.parse_string("_1 = 1;")
-  #   end
-  #   assert_raises Parser::ParseError do
-  #     @lang_parser.parse_string("1 = 1;")
-  #   end
-  #   assert_raises Parser::ParseError do
-  #     @lang_parser.parse_string("1 = 1;")
-  #   end
-  #   assert_raises Parser::ParseError do
-  #     @lang_parser.parse_string("_a? = 1;")
-  #   end
-  # end
-
-  # # Test for comparsion expressions
-  # def test_comparison_expr
-  #   assert_equal(true, @lang_parser.parse_string("return 1 < 2;"))
-  #   assert_equal(false, @lang_parser.parse_string("return 1 > 2;"))
-
-  #   assert_equal(false, @lang_parser.parse_string("return 1 >= 2;"))
-  #   assert_equal(true, @lang_parser.parse_string("return 2 >= 2;"))
-  #   assert_equal(true, @lang_parser.parse_string("return 1 <= 2;"))
-  #   assert_equal(false, @lang_parser.parse_string("return 3 <= 2;"))
-
-  #   assert_equal(false, @lang_parser.parse_string("return 1 == 2;"))
-  #   assert_equal(true, @lang_parser.parse_string("return 2 == 2;"))
-  #   assert_equal(true, @lang_parser.parse_string("return false == false;"))
-  #   assert_equal(true, @lang_parser.parse_string("a=2; return a == 2;"))
-  #   assert_equal(false, @lang_parser.parse_string("a=2; return a == 3;"))
-
-  #   assert_equal(true, @lang_parser.parse_string("return 1 != 2;"))
-  #   assert_equal(false, @lang_parser.parse_string("return 2 != 2;"))
-  # end
-
-  # # Test for bool assignment
-  # def test_assignmen_bool
-  #   assert_equal(false, @lang_parser.parse_string("a = false; return a;"))
-  #   assert_equal(true, @lang_parser.parse_string("a = true; return a;"))
-  # end
-
-  # # Test for logical expressions 
-  # def test_logical_expr
-  #   assert_equal(false, @lang_parser.parse_string("a = true && false; return a;"))
-  #   assert_equal(true, @lang_parser.parse_string("a = false || true; return a;"))
-  #   assert_equal(true, @lang_parser.parse_string("a = true && false || true; return a;"))
-  # end
-
-  # # Test for if statements
-  # def test_if_statement
-  #   assert_equal(11, @lang_parser.parse_string("a=1; if(10>1){b=10; a=a+b;} return a;"))
-  #   assert_equal(1, @lang_parser.parse_string("a=1; if(a<1){b=10; a=a+b;} return a;"))
-    
-  #   # Raises error when variable has not been defined in if-statement
-  #   assert_raises RuntimeError do
-  #     @lang_parser.parse_string("if(10<1){a=33;} return a;")
-  #   end
-  # end
-
-  # # Test for define function and call
-  # def test_function_def_and_call
-  #   assert_equal(4, @lang_parser.parse_string("def test(z,x){a = z+x; return a+1;} b=test(1,2); return b;"))
-  #   assert_equal(11, @lang_parser.parse_string("def test(){a = 10; return a+1;} return test();"))
-  #   assert_equal(true, @lang_parser.parse_string("def test(x){return x && true;} return test(true);"))
-  #   assert_equal(100, @lang_parser.parse_string("a=1; b=99; def test(x){c=x+b; return c;} return test(a);"))
-  #   assert_equal(100, @lang_parser.parse_string("a=1; b=99; def test(x){a=x+b;} test(a); return a;"))
-
-  #   # Raises error when functioncall with wrong number of arguments
-  #   assert_raises RuntimeError do
-  #     @lang_parser.parse_string("def test(){a = 10; return a+1;} return test(1);")
-  #   end
-
-  #   # Raises error when functioncall with wrong name
-  #   assert_raises RuntimeError do
-  #     @lang_parser.parse_string("def test(){a = 10; return a+1;} a(1);")
-  #   end
-  # end
-
-  # # Test for while-statement
-  # def test_while_statement
-  #   assert_equal(10, @lang_parser.parse_string("a=1; while(a<10){a=a+1;} return a;"))
-  #   assert_equal(18, @lang_parser.parse_string("a=1; while(a<10){b=a*2; a=a+1;} return b;"))
-
-  #   assert_raises RuntimeError do
-  #     assert_equal(10, @lang_parser.parse_string("a=1; while(a>10){b=a+1;} return b;"))
-  #   end  
-  # end
-
-  # Test for recursion
-  def test_recursion
-    # assert_equal(720, @lang_parser.parse_string("def factorial(n){if(n==0 || n==1){return 1;} return n*factorial(n-1);} print(factorial(6);)"))
-    assert_equal(720, @lang_parser.parse_string("x=1; def hahatest(){ print(x); return x;} x=99; def tt(){x=22;}  print(hahatest()); tt(); return x;"))
-  end
-end