Skip to content

Commit

Permalink
Merge branch 'master' into 3069_remove-nop
Browse files Browse the repository at this point in the history
  • Loading branch information
levBagryansky committed Apr 10, 2024
2 parents 2ce87c2 + 42e1e46 commit 283da2e
Show file tree
Hide file tree
Showing 28 changed files with 867 additions and 588 deletions.
8 changes: 5 additions & 3 deletions .codacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# are not available for the project. For example a lot of
# package name contains capital letter and such names are conventional.
exclude_paths:
- "eo-runtime/src/main/java/EOorg/EOeolang/EOmalloc$EOmemory_block_pointer$EOfree.java"
- "eo-runtime/src/main/java/EOorg/EOeolang/EOmalloc$EOmemory_block_pointer$EOread.java"
- "eo-runtime/src/main/java/EOorg/EOeolang/EOmalloc$EOmemory_block_pointer$EOwrite.java"
- "eo-runtime/src/main/java/EOorg/EOeolang/EOcage$EOencaged$EOencage.java"
- "eo-runtime/src/main/java/EOorg/EOeolang/Cages.java"
- "eo-runtime/src/main/java/EOorg/EOeolang/EOcage$EOencaged$EOφ.java"
- "eo-runtime/src/main/java/EOorg/EOeolang/EOcage$φ.java"
- "eo-runtime/src/test/java/EOorg/EOeolang/CagesTest.java"
19 changes: 15 additions & 4 deletions eo-runtime/src/main/eo/org/eolang/cage.eo
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,18 @@
# This object is doing exactly the same as "memory", but allows
# you to store objects, not only data. In other words, it doesn't
# do dataization when objects are being stored.
[] > cage
# Make new `cage` for an object. After application this `new` object starts behave
# like `it` object.
[it] > new /?
[object] > cage
@.self > new

# Object encaged for the first time.
[] > @ /encaged

# Object encaged by locator.
[locator] > encaged
$ > self

# Retrieved encaged object by locator.
[] > @ /?

# Encage new object by locator.
[object] > encage /true
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,5 @@
+rt jvm org.eolang:eo-runtime:0.0.0
+version 0.0.0

# Dataizes given `object`, makes new `bytes` from the data and behaves as given `bytes`.
[object] > const
(memory object).alloc > cached

# Object for using the cached one.
[] > make
^.cached > @
# Dataizes given `target`, makes new `bytes` from the data and behaves as result `bytes`.
[target] > dataized /bytes
8 changes: 7 additions & 1 deletion eo-runtime/src/main/eo/org/eolang/memory.eo
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,13 @@
@.alloc > alloc

# Allocate data in memory and return `allocated`.
[] > @ /allocated
[] > @
(dataized ^.data).as-bytes > bts
(malloc bts.size).pointer > p
seq > @
*
p.write 0 bts
^.allocated p

# Data allocated in memory.
[pointer] > allocated
Expand Down
11 changes: 6 additions & 5 deletions eo-runtime/src/main/eo/org/eolang/switch.eo
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@
# e.g.
# switch
# *
# TRUE
# "this value will be returned"
# *
# FALSE
# "this value will be skipped"
# *
# TRUE
# "this value will be returned"
# *
# FALSE
# "this value will be skipped"
#
# This object returns value of only first truly statement.
[cases] > switch
Expand Down
118 changes: 118 additions & 0 deletions eo-runtime/src/main/java/EOorg/EOeolang/Cages.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2016-2024 Objectionary.com
*
* 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 NON-INFRINGEMENT. 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.
*/

/*
* @checkstyle PackageNameCheck (4 lines)
*/
package EOorg.EOeolang;

import java.util.concurrent.ConcurrentHashMap;
import org.eolang.ExFailure;
import org.eolang.Phi;
import org.eolang.Versionized;

/**
* Cages for objects.
* @since 0.36.0
*/
@Versionized
final class Cages {
/**
* Cages instance.
*/
static final Cages INSTANCE = new Cages();

/**
* Encaged objects.
*/
private final ConcurrentHashMap<Integer, Phi> objects = new ConcurrentHashMap<>(0);

/**
* Ctor.
*/
private Cages() {
// singleton :(
}

/**
* Encage object for the first time.
* When object is encaged - locator will be generated.
* @param object Object ot encage
* @return Locator to the object in cage
*/
int init(final Phi object) {
final int locator = object.hashCode();
this.objects.putIfAbsent(locator, object);
return locator;
}

/**
* Encage object by locator.
* @param locator Locator to the object in cage
* @param object Object to encage
*/
void encage(final int locator, final Phi object) {
synchronized (this.objects) {
if (!this.objects.containsKey(locator)) {
throw new ExFailure(
String.format(
"Encaged object with locator %d was not initialized, can't reencage, can't encage",
locator
)
);
}
final String current = this.objects.get(locator).forma();
final String forma = object.forma();
if (!current.equals(forma)) {
throw new ExFailure(
String.format(
"Can't encage an object formed by %s because object formed by %s was encaged before",
forma,
current
)
);
}
this.objects.put(locator, object);
}
}

/**
* Get object from cage by locator.
* @param locator The locator of the object
* @return Object
*/
Phi get(final int locator) {
synchronized (this.objects) {
if (!this.objects.containsKey(locator)) {
throw new ExFailure(
String.format(
"Object with locator %d is absent in cage, can't get",
locator
)
);
}
return this.objects.get(locator);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2016-2024 Objectionary.com
*
* 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 NON-INFRINGEMENT. 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.
*/

/*
* @checkstyle PackageNameCheck (4 lines)
*/
package EOorg.EOeolang;

import org.eolang.AtVoid;
import org.eolang.Atom;
import org.eolang.Attr;
import org.eolang.Data;
import org.eolang.Param;
import org.eolang.PhDefault;
import org.eolang.Phi;
import org.eolang.Versionized;
import org.eolang.XmirObject;

/**
* Cage.encaged.encage object.
* @since 0.36.0
* @checkstyle TypeNameCheck (5 lines)
*/
@Versionized
@XmirObject(oname = "cage.encaged.encage")
final class EOcage$EOencaged$EOencage extends PhDefault implements Atom {
/**
* Ctor.
* @param sigma Sigma
*/
EOcage$EOencaged$EOencage(final Phi sigma) {
super(sigma);
this.add("object", new AtVoid("object"));
}

@Override
public Phi lambda() throws Exception {
Cages.INSTANCE.encage(
Math.toIntExact(
new Param(this.take(Attr.RHO), "locator").strong(Long.class)
),
this.take("object")
);
return new Data.ToPhi(true);
}
}
65 changes: 65 additions & 0 deletions eo-runtime/src/main/java/EOorg/EOeolang/EOcage$EOencaged$EOφ.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2016-2024 Objectionary.com
*
* 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 NON-INFRINGEMENT. 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.
*/

/*
* @checkstyle PackageNameCheck (4 lines)
*/
package EOorg.EOeolang;

import org.eolang.Atom;
import org.eolang.Attr;
import org.eolang.Param;
import org.eolang.PhDefault;
import org.eolang.PhTracedLocator;
import org.eolang.Phi;
import org.eolang.Versionized;
import org.eolang.XmirObject;

/**
* Cage.encaged.φ object.
* @since 0.36.0
* @checkstyle TypeNameCheck (5 lines)
*/
@Versionized
@XmirObject(oname = "cage.encaged.@")
final class EOcage$EOencaged$EOφ extends PhDefault implements Atom {
/**
* Ctor.
* @param sigma Sigma
*/
EOcage$EOencaged$EOφ(final Phi sigma) {
super(sigma);
}

@Override
public Phi lambda() throws Exception {
final int locator = Math.toIntExact(
new Param(this.take(Attr.RHO), "locator").strong(Long.class)
);
return new PhTracedLocator(
Cages.INSTANCE.get(locator),
locator
);
}
}
Loading

0 comments on commit 283da2e

Please sign in to comment.